diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md
index 1cae9a17..375f730d 100644
--- a/Documentation/bootkube.md
+++ b/Documentation/bootkube.md
@@ -27,7 +27,7 @@ The [examples](../examples) statically assign IP addresses to libvirt client VMs
 
 ## Assets
 
-Download the CoreOS image assets referenced in the target [profile](../examples/profiles).
+Download the CoreOS Container Linux image assets referenced in the target [profile](../examples/profiles).
 
 ```sh
 $ ./scripts/get-coreos stable 1353.7.0 ./examples/assets
@@ -54,7 +54,7 @@ bootkube render --asset-dir=assets --api-servers=https://node1.example.com:443 -
 
 Use rkt or docker to start `matchbox` and mount the desired example resources. Create a network boot environment and power-on your machines. Revisit [matchbox with rkt](getting-started-rkt.md) or [matchbox with Docker](getting-started-docker.md) for help.
 
-Client machines should boot and provision themselves. Local client VMs should network boot CoreOS and become available via SSH in about 1 minute. If you chose `bootkube-install`, notice that machines install CoreOS and then reboot (in libvirt, you must hit "power" again). Time to network boot and provision physical hardware depends on a number of factors (POST duration, boot device iteration, network speed, etc.).
+Client machines should boot and provision themselves. Local client VMs should network boot Container Linux and become available via SSH in about 1 minute. If you chose `bootkube-install`, notice that machines install Container Linux and then reboot (in libvirt, you must hit "power" again). Time to network boot and provision physical hardware depends on a number of factors (POST duration, boot device iteration, network speed, etc.).
 
 ## bootkube
 
@@ -128,7 +128,7 @@ kube-system   kube-scheduler-694795526-fks0b             1/1       Running   1
 kube-system   pod-checkpointer-node1.example.com         1/1       Running   2          10m
 ```
 
-Try deleting pods to see that the cluster is resilient to failures and machine restarts (CoreOS auto-updates).
+Try deleting pods to see that the cluster is resilient to failures and machine restarts (Container Linux auto-updates).
 
 ## Going further
 
diff --git a/Documentation/container-linux-config.md b/Documentation/container-linux-config.md
index 2adc415d..3fb0aaae 100644
--- a/Documentation/container-linux-config.md
+++ b/Documentation/container-linux-config.md
@@ -75,7 +75,7 @@ passwd:
 ```
 <!-- {% endraw %} -->
 
-The Ignition config response (formatted) to a query `/ignition?label=value` for a CoreOS instance supporting Ignition 2.0.0 would be:
+The Ignition config response (formatted) to a query `/ignition?label=value` for a Container Linux instance supporting Ignition 2.0.0 would be:
 
 ```json
 {
diff --git a/Documentation/deployment.md b/Documentation/deployment.md
index 5be4ed0f..f7f6ef53 100644
--- a/Documentation/deployment.md
+++ b/Documentation/deployment.md
@@ -4,11 +4,11 @@ This guide walks through deploying the `matchbox` service on a Linux host (via R
 
 ## Provisoner
 
-`matchbox` is a service for network booting and provisioning machines to create Container Linux clusters. `matchbox` should be installed on a provisioner machine (CoreOS or any Linux distribution) or cluster (Kubernetes) which can serve configs to client machines in a lab or datacenter.
+`matchbox` is a service for network booting and provisioning machines to create CoreOS Container Linux clusters. `matchbox` should be installed on a provisioner machine (Container Linux or any Linux distribution) or cluster (Kubernetes) which can serve configs to client machines in a lab or datacenter.
 
 Choose one of the supported installation options:
 
-* [CoreOS (rkt)](#coreos)
+* [CoreOS Container Linux (rkt)](#coreos-container-linux)
 * [RPM-based](#rpm-based-distro)
 * [Generic Linux (binary)](#generic-linux)
 * [With rkt](#rkt)
@@ -52,9 +52,9 @@ dnf install matchbox
 
 RPMs are not currently available for CentOS and RHEL (due to Go version). CentOS and RHEL users should follow the Generic Linux section below.
 
-### CoreOS
+### CoreOS Container Linux
 
-On a CoreOS provisioner, rkt run `matchbox` image with the provided systemd unit.
+On a Container Linux provisioner, rkt run `matchbox` image with the provided systemd unit.
 
 ```sh
 $ sudo cp contrib/systemd/matchbox-on-coreos.service /etc/systemd/system/matchbox.service
@@ -112,7 +112,7 @@ Environment="MATCHBOX_ADDRESS=0.0.0.0:8080"
 Environment="MATCHBOX_RPC_ADDRESS=0.0.0.0:8081"
 ```
 
-The Tectonic [Installer](https://tectonic.com/enterprise/docs/latest/install/bare-metal/index.html) uses this API. Tectonic users with a CoreOS provisioner can start with an example that enables it.
+The Tectonic [Installer](https://tectonic.com/enterprise/docs/latest/install/bare-metal/index.html) uses this API. Tectonic users with a Container Linux provisioner can start with an example that enables it.
 
 ```sh
 $ sudo cp contrib/systemd/matchbox-for-tectonic.service /etc/systemd/system/matchbox.service
@@ -206,11 +206,11 @@ Certificate chain
 ....
 ```
 
-## Download CoreOS (optional)
+## Download Container Linux (optional)
 
-`matchbox` can serve CoreOS images in development or lab environments to reduce bandwidth usage and increase the speed of CoreOS PXE boots and installs to disk.
+`matchbox` can serve Container Linux images in development or lab environments to reduce bandwidth usage and increase the speed of Container Linux PXE boots and installs to disk.
 
-Download a recent CoreOS [release](https://coreos.com/releases/) with signatures.
+Download a recent Container Linux [release](https://coreos.com/releases/) with signatures.
 
 ```sh
 $ ./scripts/get-coreos stable 1353.7.0 .     # note the "." 3rd argument
@@ -242,7 +242,7 @@ $ curl http://matchbox.example.com:8080/assets/coreos/1353.7.0/
 <pre>...
 ```
 
-For large production environments, use a cache proxy or mirror suitable for your environment to serve CoreOS images. See [contrib/squid](../contrib/squid/README.md) for details.
+For large production environments, use a cache proxy or mirror suitable for your environment to serve Container Linux images. See [contrib/squid](../contrib/squid/README.md) for details.
 
 ## Network
 
diff --git a/Documentation/getting-started-docker.md b/Documentation/getting-started-docker.md
index 8a5bf803..e856bd97 100644
--- a/Documentation/getting-started-docker.md
+++ b/Documentation/getting-started-docker.md
@@ -1,7 +1,7 @@
 
 # Getting started with Docker
 
-In this tutorial, we'll run `matchbox` on your Linux machine with Docker to network boot and provision a cluster of QEMU/KVM CoreOS machines locally. You'll be able to create Kubernetes clusters, etcd3 clusters, and test network setups.
+In this tutorial, we'll run `matchbox` on your Linux machine with Docker to network boot and provision a cluster of QEMU/KVM Container Linux machines locally. You'll be able to create Kubernetes clusters, etcd3 clusters, and test network setups.
 
 *Note*: To provision physical machines, see [network setup](network-setup.md) and [deployment](deployment.md).
 
@@ -26,7 +26,7 @@ $ git clone https://github.com/coreos/matchbox.git
 $ cd matchbox
 ```
 
-Download CoreOS image assets referenced by the `etcd-docker` [example](../examples) to `examples/assets`.
+Download CoreOS Container Linux image assets referenced by the `etcd-docker` [example](../examples) to `examples/assets`.
 
 ```sh
 $ ./scripts/get-coreos stable 1353.7.0 ./examples/assets
diff --git a/Documentation/getting-started-rkt.md b/Documentation/getting-started-rkt.md
index bdc4dd7f..83d847e5 100644
--- a/Documentation/getting-started-rkt.md
+++ b/Documentation/getting-started-rkt.md
@@ -1,6 +1,6 @@
 # Getting started with rkt
 
-In this tutorial, we'll run `matchbox` on your Linux machine with `rkt` and `CNI` to network boot and provision a cluster of QEMU/KVM CoreOS machines locally. You'll be able to create Kubernetes clustes, etcd3 clusters, and test network setups.
+In this tutorial, we'll run `matchbox` on your Linux machine with `rkt` and `CNI` to network boot and provision a cluster of QEMU/KVM Container Linux machines locally. You'll be able to create Kubernetes clustes, etcd3 clusters, and test network setups.
 
 *Note*: To provision physical machines, see [network setup](network-setup.md) and [deployment](deployment.md).
 
@@ -27,7 +27,7 @@ $ git clone https://github.com/coreos/matchbox.git
 $ cd matchbox
 ```
 
-Download CoreOS image assets referenced by the `etcd` [example](../examples) to `examples/assets`.
+Download CoreOS Container Linux image assets referenced by the `etcd` [example](../examples) to `examples/assets`.
 
 ```sh
 $ ./scripts/get-coreos stable 1353.7.0 ./examples/assets
diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md
index b057eec1..6d20e890 100644
--- a/Documentation/getting-started.md
+++ b/Documentation/getting-started.md
@@ -8,7 +8,7 @@ You'll install the `matchbox` service, setup a PXE network boot environment, and
 
 Install `matchbox` on a dedicated server or Kubernetes cluster. Generate TLS credentials and enable the gRPC API as directed. Save the `ca.crt`, `client.crt`, and `client.key` on your local machine (e.g. `~/.matchbox`).
 
-* Installing on [CoreOS / Linux distros](deployment.md)
+* Installing on [CoreOS Container Linux and other Linux distros](deployment.md)
 * Installing on [Kubernetes](deployment.md#kubernetes)
 * Running with [rkt](deployment.md#rkt) / [docker](deployment.md#docker)
 
@@ -61,7 +61,7 @@ $ git clone https://github.com/coreos/matchbox.git
 $ cd matchbox/examples/terraform
 ```
 
-Let's start with the `simple-install` example. With `simple-install`, any machines which PXE boot from matchbox will install CoreOS to `dev/sda`, reboot, and have your SSH key set. Its not much of a cluster, but we'll get to that later.
+Let's start with the `simple-install` example. With `simple-install`, any machines which PXE boot from matchbox will install Container Linux to `dev/sda`, reboot, and have your SSH key set. Its not much of a cluster, but we'll get to that later.
 
 ```sh
 $ cd simple-install
diff --git a/Documentation/machine-lifecycle.md b/Documentation/machine-lifecycle.md
index 7bee2e6e..2b74fb75 100644
--- a/Documentation/machine-lifecycle.md
+++ b/Documentation/machine-lifecycle.md
@@ -4,9 +4,9 @@
 
 Physical machines [network boot](network-booting.md) in an network boot environment with DHCP/TFTP/DNS services or with [coreos/dnsmasq](../contrib/dnsmasq).
 
-`matchbox` serves iPXE or GRUB configs via HTTP to machines based on Group selectors (e.g. UUID, MAC, region, etc.) and machine Profiles. Kernel and initrd images are fetched and booted with Ignition to install CoreOS. The "first boot" Ignition config if fetched and CoreOS is installed.
+`matchbox` serves iPXE or GRUB configs via HTTP to machines based on Group selectors (e.g. UUID, MAC, region, etc.) and machine Profiles. Kernel and initrd images are fetched and booted with Ignition to install CoreOS Container Linux. The "first boot" Ignition config if fetched and Container Linux is installed.
 
-CoreOS boots ("first boot" from disk) and runs Ignition to provision its disk with systemd units, files, keys, and more to become a cluster node. Systemd units may fetch metadata from a remote source if needed.
+Container Linux boots ("first boot" from disk) and runs Ignition to provision its disk with systemd units, files, keys, and more to become a cluster node. Systemd units may fetch metadata from a remote source if needed.
 
 Coordinated auto-updates are enabled. Systems like [fleet](https://coreos.com/docs/#fleet) or [Kubernetes](http://kubernetes.io/docs/) coordinate container services. IPMI, vendor utilities, or first-boot are used to re-provision machines into new roles.
 
diff --git a/Documentation/matchbox.md b/Documentation/matchbox.md
index d7a2aa3e..896d48e7 100644
--- a/Documentation/matchbox.md
+++ b/Documentation/matchbox.md
@@ -1,6 +1,6 @@
 # matchbox
 
-`matchbox` is an HTTP and gRPC service that renders signed [Ignition configs](https://coreos.com/ignition/docs/latest/what-is-ignition.html), [cloud-configs](https://coreos.com/os/docs/latest/cloud-config.html), network boot configs, and metadata to machines to create Container Linux clusters. `matchbox` maintains **Group** definitions which match machines to *profiles* based on labels (e.g. MAC address, UUID, stage, region). A **Profile** is a named set of config templates (e.g. iPXE, GRUB, Ignition config, Cloud-Config, generic configs). The aim is to use CoreOS Linux's early-boot capabilities to provision CoreOS machines.
+`matchbox` is an HTTP and gRPC service that renders signed [Ignition configs](https://coreos.com/ignition/docs/latest/what-is-ignition.html), [cloud-configs](https://coreos.com/os/docs/latest/cloud-config.html), network boot configs, and metadata to machines to create CoreOS Container Linux clusters. `matchbox` maintains **Group** definitions which match machines to *profiles* based on labels (e.g. MAC address, UUID, stage, region). A **Profile** is a named set of config templates (e.g. iPXE, GRUB, Ignition config, Cloud-Config, generic configs). The aim is to use Container Linux's early-boot capabilities to provision Container Linux machines.
 
 Network boot endpoints provide PXE, iPXE, GRUB support. `matchbox` can be deployed as a binary, as an [appc](https://github.com/appc/spec) container with rkt, or as a Docker container.
 
@@ -59,7 +59,7 @@ Profiles reference an Ignition config, Cloud-Config, and/or generic config by na
 ```json
 {
   "id": "etcd",
-  "name": "CoreOS with etcd2",
+  "name": "Container Linux with etcd2",
   "cloud_id": "",
   "ignition_id": "etcd.yaml",
   "generic_id": "some-service.cfg",
@@ -173,7 +173,7 @@ matchbox.foo/assets/
 
 For example, a `Profile` might refer to a local asset `/assets/coreos/VERSION/coreos_production_pxe.vmlinuz` instead of `http://stable.release.core-os.net/amd64-usr/VERSION/coreos_production_pxe.vmlinuz`.
 
-See the [get-coreos](../scripts/README.md#get-coreos) script to quickly download, verify, and place CoreOS assets.
+See the [get-coreos](../scripts/README.md#get-coreos) script to quickly download, verify, and place Container Linux assets.
 
 ## Network
 
diff --git a/Documentation/network-booting.md b/Documentation/network-booting.md
index 7e39eaeb..12cb4e86 100644
--- a/Documentation/network-booting.md
+++ b/Documentation/network-booting.md
@@ -15,7 +15,7 @@ The network environment can be set up in a number of ways, which we'll discuss.
 
 ### Network boot programs
 
-Machines can be booted and configured with CoreOS using several network boot programs and approaches. Let's review them. If you're new to network booting or unsure which to choose, iPXE is a reasonable and flexible choice.
+Machines can be booted and configured with CoreOS Container Linux using several network boot programs and approaches. Let's review them. If you're new to network booting or unsure which to choose, iPXE is a reasonable and flexible choice.
 
 #### PXELINUX
 
@@ -26,7 +26,7 @@ $ mybootdir/pxelinux.cfg/b8945908-d6a6-41a9-611d-74a6ab80b83d
 $ mybootdir/pxelinux.cfg/default
 ```
 
-Here is an example PXE config file which boots a CoreOS image hosted on the TFTP server.
+Here is an example PXE config file which boots a Container Linux image hosted on the TFTP server.
 
 ```
 default coreos
@@ -53,7 +53,7 @@ This approach has a number of drawbacks. TFTP can be slow, managing config files
 
 A DHCPOFFER to iPXE client firmware specifies an HTTP boot script such as `http://matchbox.foo/boot.ipxe`.
 
-Here is an example iPXE script for booting the remote CoreOS stable image.
+Here is an example iPXE script for booting the remote Container Linux stable image.
 
 ```
 #!ipxe
diff --git a/Documentation/network-setup.md b/Documentation/network-setup.md
index d770b8c0..47af87dd 100644
--- a/Documentation/network-setup.md
+++ b/Documentation/network-setup.md
@@ -2,7 +2,7 @@
 
 This guide shows how to create a DHCP/TFTP/DNS network boot environment to work with `matchbox` to boot and provision PXE, iPXE, or GRUB2 client machines.
 
-`matchbox` serves iPXE scripts or GRUB configs over HTTP to serve as the entrypoint for CoreOS cluster bring-up. It does not implement or exec a DHCP, TFTP, or DNS server. Instead, you can configure your own network services to point to `matchbox` or use the convenient [coreos/dnsmasq](../contrib/dnsmasq) container image (used in libvirt demos).
+`matchbox` serves iPXE scripts or GRUB configs over HTTP to serve as the entrypoint for CoreOS Container Linux cluster bring-up. It does not implement or exec a DHCP, TFTP, or DNS server. Instead, you can configure your own network services to point to `matchbox` or use the convenient [coreos/dnsmasq](../contrib/dnsmasq) container image (used in libvirt demos).
 
 *Note*: These are just suggestions. Your network administrator or system administrator should choose the right network setup for your company.
 
diff --git a/README.md b/README.md
index d7761749..f072b35a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 ### Installation
 
 * Installation
-    * Installing on [CoreOS / Linux distros](Documentation/deployment.md)
+    * Installing on [CoreOS Container Linux and other Linux distros](Documentation/deployment.md)
     * Installing on [Kubernetes](Documentation/deployment.md#kubernetes)
     * Running with [rkt](Documentation/deployment.md#rkt) / [docker](Documentation/deployment.md#docker)
 * [Network Setup](Documentation/network-setup.md)
diff --git a/contrib/squid/README.md b/contrib/squid/README.md
index 71d79758..605a2285 100644
--- a/contrib/squid/README.md
+++ b/contrib/squid/README.md
@@ -65,7 +65,7 @@ iptables -t nat -A PREROUTING -i enp14s0 -p tcp --dport 80 -j REDIRECT --to-port
 
 Your DHCP server should be configured so the Squid host is the default gateway for PXE, iPXE, or GRUB2 clients. For deployments that run Squid on the same host as dnsmasq, remove any DHCP option 3 settings. For example ```--dhcp-option=3,192.168.10.1"```
 
-Update Matchbox policies to use the url of the CoreOS kernel/initrd download site:
+Update Matchbox policies to use the url of the Container Linux kernel/initrd download site:
 ```
 cat policy/etcd3.json
 {
diff --git a/examples/README.md b/examples/README.md
index 3be8a16c..a317ebd8 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -20,11 +20,11 @@ You are encouraged to look through the examples and Terraform modules. Implement
 
 These examples mount raw Matchbox objects into a Matchbox server's `/var/lib/matchbox/` directory.
 
-| Name       | Description | CoreOS Version | FS | Docs | 
+| Name       | Description | CoreOS Container Linux Version | FS | Docs | 
 |------------|-------------|----------------|----|-----------|
-| simple | CoreOS with autologin, using iPXE | stable/1353.7.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
-| simple-install | CoreOS Install, using iPXE | stable/1353.7.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
-| grub | CoreOS via GRUB2 Netboot | stable/1353.7.0 | RAM | NA |
+| simple | CoreOS Container Linux with autologin, using iPXE | stable/1353.7.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
+| simple-install | CoreOS Container Linux Install, using iPXE | stable/1353.7.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
+| grub | CoreOS Container Linux via GRUB2 Netboot | stable/1353.7.0 | RAM | NA |
 | etcd3 | PXE boot a 3 node etcd3 cluster with proxies | stable/1353.7.0 | RAM | None |
 | etcd3-install | Install a 3 node etcd3 cluster to disk | stable/1353.7.0 | Disk | None |
 | bootkube | PXE boot a self-hosted Kubernetes v1.6.4 cluster | stable/1353.7.0 | Disk | [tutorial](../Documentation/bootkube.md) |
diff --git a/examples/groups/bootkube-install/install.json b/examples/groups/bootkube-install/install.json
index 9ca84afb..e560c41b 100644
--- a/examples/groups/bootkube-install/install.json
+++ b/examples/groups/bootkube-install/install.json
@@ -1,6 +1,6 @@
 {
   "id": "coreos-install",
-  "name": "CoreOS Install",
+  "name": "CoreOS Container Linux Install",
   "profile": "install-reboot",
   "metadata": {
     "coreos_channel": "stable",
diff --git a/examples/groups/etcd3-install/install.json b/examples/groups/etcd3-install/install.json
index 9ca84afb..e560c41b 100644
--- a/examples/groups/etcd3-install/install.json
+++ b/examples/groups/etcd3-install/install.json
@@ -1,6 +1,6 @@
 {
   "id": "coreos-install",
-  "name": "CoreOS Install",
+  "name": "CoreOS Container Linux Install",
   "profile": "install-reboot",
   "metadata": {
     "coreos_channel": "stable",
diff --git a/examples/groups/grub/default.json b/examples/groups/grub/default.json
index 08a3cde6..b69a8860 100644
--- a/examples/groups/grub/default.json
+++ b/examples/groups/grub/default.json
@@ -1,5 +1,5 @@
 {
   "id": "default",
-  "name": "GRUB CoreOS alpha",
+  "name": "GRUB CoreOS Container Linux alpha",
   "profile": "grub"
 }
diff --git a/examples/groups/simple-install/install.json b/examples/groups/simple-install/install.json
index 9b19b3d0..c25e7318 100644
--- a/examples/groups/simple-install/install.json
+++ b/examples/groups/simple-install/install.json
@@ -1,6 +1,6 @@
 {
   "id": "install",
-  "name": "Simple CoreOS Alpha Install",
+  "name": "Simple CoreOS Container Linux Alpha Install",
   "profile": "simple-install",
   "metadata": {
     "coreos_channel": "stable",
diff --git a/examples/groups/simple-install/simple.json b/examples/groups/simple-install/simple.json
index 30e7cf66..21279000 100644
--- a/examples/groups/simple-install/simple.json
+++ b/examples/groups/simple-install/simple.json
@@ -1,6 +1,6 @@
 {
   "id": "simple",
-  "name": "Simple CoreOS Alpha",
+  "name": "Simple CoreOS Container Linux Alpha",
   "profile": "simple",
   "selector": {
     "os": "installed"
diff --git a/examples/groups/simple/default.json b/examples/groups/simple/default.json
index 82d510a4..2db7201d 100644
--- a/examples/groups/simple/default.json
+++ b/examples/groups/simple/default.json
@@ -1,5 +1,5 @@
 {
   "id": "default",
-  "name": "Simple CoreOS Alpha with RAM disk",
+  "name": "Simple CoreOS Container Linux Alpha with RAM disk",
   "profile": "simple"
 }
diff --git a/examples/profiles/grub.json b/examples/profiles/grub.json
index 08f9c0b9..1ef61fbe 100644
--- a/examples/profiles/grub.json
+++ b/examples/profiles/grub.json
@@ -1,6 +1,6 @@
 {
   "id": "grub",
-  "name": "CoreOS via GRUB2",
+  "name": "CoreOS Container Linux via GRUB2",
   "boot": {
     "kernel": "(http;matchbox.foo:8080)/assets/coreos/1353.7.0/coreos_production_pxe.vmlinuz",
     "initrd": ["(http;matchbox.foo:8080)/assets/coreos/1353.7.0/coreos_production_pxe_image.cpio.gz"],
diff --git a/examples/profiles/install-reboot.json b/examples/profiles/install-reboot.json
index a44db3c4..5f342b15 100644
--- a/examples/profiles/install-reboot.json
+++ b/examples/profiles/install-reboot.json
@@ -1,6 +1,6 @@
 {
   "id": "install-reboot",
-  "name": "Install CoreOS and Reboot",
+  "name": "Install CoreOS Container Linux and Reboot",
   "boot": {
     "kernel": "/assets/coreos/1353.7.0/coreos_production_pxe.vmlinuz",
     "initrd": ["/assets/coreos/1353.7.0/coreos_production_pxe_image.cpio.gz"],
diff --git a/examples/profiles/simple-install.json b/examples/profiles/simple-install.json
index 517626ed..e434654f 100644
--- a/examples/profiles/simple-install.json
+++ b/examples/profiles/simple-install.json
@@ -1,6 +1,6 @@
 {
   "id": "simple-install",
-  "name": "Simple CoreOS Alpha Install",
+  "name": "Simple CoreOS Container Linux Alpha Install",
   "boot": {
     "kernel": "/assets/coreos/1353.7.0/coreos_production_pxe.vmlinuz",
     "initrd": ["/assets/coreos/1353.7.0/coreos_production_pxe_image.cpio.gz"],
diff --git a/examples/profiles/simple.json b/examples/profiles/simple.json
index f244d484..4b0d528a 100644
--- a/examples/profiles/simple.json
+++ b/examples/profiles/simple.json
@@ -1,6 +1,6 @@
 {
 	"id": "simple",
-	"name": "Simple CoreOS Alpha",
+	"name": "Simple CoreOS Container Linux Alpha",
 	"boot": {
 		"kernel": "/assets/coreos/1353.7.0/coreos_production_pxe.vmlinuz",
 		"initrd": ["/assets/coreos/1353.7.0/coreos_production_pxe_image.cpio.gz"],
diff --git a/examples/terraform/simple-install/groups.tf b/examples/terraform/simple-install/groups.tf
index fab94012..e50be2c7 100644
--- a/examples/terraform/simple-install/groups.tf
+++ b/examples/terraform/simple-install/groups.tf
@@ -10,7 +10,7 @@ resource "matchbox_group" "default" {
   }
 }
 
-// Match machines which have CoreOS installed
+// Match machines which have CoreOS Container Linux installed
 resource "matchbox_group" "node1" {
   name    = "node1"
   profile = "${matchbox_profile.simple.name}"
diff --git a/scripts/README.md b/scripts/README.md
index 137fea76..09a32a3e 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -3,7 +3,7 @@
 
 ## get-coreos
 
-Run the `get-coreos` script to download CoreOS images, verify them, and move them into `examples/assets`.
+Run the `get-coreos` script to download CoreOS Container Linux images, verify them, and move them into `examples/assets`.
 
     ./scripts/get-coreos
     ./scripts/get-coreos channel version