diff --git a/404.html b/404.html
index e8bc55f..136af82 100644
--- a/404.html
+++ b/404.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
@@ -23,7 +23,7 @@
 
     <div class="container">
       <div class="header clearfix">
-        <div class="header-home"><a href="/">Socks Shop</a></div>
+        <div class="header-home"><a href="/">Sock Shop</a></div>
         <nav>
           <ul class="nav header-nav">
             <li class=""><a href="/docs/quickstart.html">Quickstart</a></li>
@@ -54,13 +54,13 @@ <h2>Socks Not Found</h2>
           <div class="col-sm-6">
             <h3>Open Source &amp; Free</h3>
             <p>
-              Socks Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
+              Sock Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
             </p>
           </div>
           <div class="col-sm-6">
-            <h3>Socks Shop on Slack</h3>
+            <h3>Sock Shop on Slack</h3>
             <p>
-              The Weave Community hosts the Socks Shop Slack channel.
+              The Weave Community hosts the Sock Shop Slack channel.
               <a href="https://weaveworks.github.io/community-slack/" target="_blank">Join Slack</a> and tell us how you're using the app.
             </p>
           </div>
diff --git a/_includes/header.html b/_includes/header.html
index ddd6436..b005926 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,5 +1,5 @@
 <div class="header clearfix">
-<div class="header-home"><a href="{{site.main_url_prefix}}/">Socks Shop</a></div>
+<div class="header-home"><a href="{{site.main_url_prefix}}/">Sock Shop</a></div>
 <nav>
   <ul class="nav header-nav">
     <li class="{% if include.quickstart %}active{% endif %}"><a href="/docs/quickstart.html">Quickstart</a></li>
diff --git a/_layouts/api.html b/_layouts/api.html
index 44bb90f..580e9a7 100644
--- a/_layouts/api.html
+++ b/_layouts/api.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
diff --git a/_layouts/default.html b/_layouts/default.html
index e42890e..233346c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
diff --git a/_layouts/quickstart.html b/_layouts/quickstart.html
index 2ce5beb..280a97d 100644
--- a/_layouts/quickstart.html
+++ b/_layouts/quickstart.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
diff --git a/deployment/apcera.md b/deployment/apcera.md
index f1a260c..cf18762 100644
--- a/deployment/apcera.md
+++ b/deployment/apcera.md
@@ -3,15 +3,15 @@ layout: default
 deployDoc: true
 ---
 
-## Socks Shop on Apcera
+## Sock Shop on Apcera
 
-These instructions will help you deploy and run the Socks Shop application on the [Apcera Platform](https://www.apcera.com/platform), an enterprise-grade container management platform for cloud-native and legacy applications.  Apcera is secure by default, only permitting things explicitly authorized by policy, and supports multi-cloud deployments.
+These instructions will help you deploy and run the Sock Shop application on the [Apcera Platform](https://www.apcera.com/platform), an enterprise-grade container management platform for cloud-native and legacy applications.  Apcera is secure by default, only permitting things explicitly authorized by policy, and supports multi-cloud deployments.
 
-Apcera has tested Socks Shop on the Apcera Community Edition running single-cloud clusters in Amazon AWS, Google Cloud Platform, Microsoft Azure, and VMware.  We have also tested Socks Shop on the Apcera Enterprise Edition running a multi-cloud cluster that spanned across AWS, GCP, and VMware.
+Apcera has tested Sock Shop on the Apcera Community Edition running single-cloud clusters in Amazon AWS, Google Cloud Platform, Microsoft Azure, and VMware.  We have also tested Sock Shop on the Apcera Enterprise Edition running a multi-cloud cluster that spanned across AWS, GCP, and VMware.
 
 ### Packaging
 
-The Socks Shop application is packaged and configured for Apcera using a [Multi-Resource Manifest file](https://docs.apcera.com/jobs/multi-resource-manifests/) called socksshop-docker.json which is similar to a Docker Compose file. Scripts are provided to make it easy to deploy all the services and a network from the manifest, to start and stop the services, and to delete everything that was deployed.
+The Sock Shop application is packaged and configured for Apcera using a [Multi-Resource Manifest file](https://docs.apcera.com/jobs/multi-resource-manifests/) called socksshop-docker.json which is similar to a Docker Compose file. Scripts are provided to make it easy to deploy all the services and a network from the manifest, to start and stop the services, and to delete everything that was deployed.
 
 ### Pre-requisites
 
@@ -23,7 +23,7 @@ The Socks Shop application is packaged and configured for Apcera using a [Multi-
 git clone https://github.com/microservices-demo/microservices-demo
 cd microservices-demo/deploy/apcera
 ```
-- *(Optional)* If you are not an admin user in your Apcera cluster, you might need an Apcera administrator to import a [policy](https://docs.apcera.com/policy/introduction/) file to give you permission to create the Socks Shop services and network in your sandbox.
+- *(Optional)* If you are not an admin user in your Apcera cluster, you might need an Apcera administrator to import a [policy](https://docs.apcera.com/policy/introduction/) file to give you permission to create the Sock Shop services and network in your sandbox.
 
 ```
 apc import policy socksShop.pol
@@ -31,11 +31,11 @@ apc import policy socksShop.pol
 
 ### Networking and Security
 
-In this demo scenario, we create a single [virtual network](https://docs.apcera.com/jobs/virtual-networks/) to which all the services except *zipkin* and *user-sim* are added. Services inside the virtual network can all talk to each other. Apcera [job links](https://docs.apcera.com/jobs/job-links/) are used to let the *user-sim* load testing service send requests to the *front-end* service and to let the main Socks Shop services send traces to the *zipkin* service. Using job links in this fashion simulates how real, cloud-based load testing and APM solutions can be integrated into applications running on Apcera without sacrificing security.
+In this demo scenario, we create a single [virtual network](https://docs.apcera.com/jobs/virtual-networks/) to which all the services except *zipkin* and *user-sim* are added. Services inside the virtual network can all talk to each other. Apcera [job links](https://docs.apcera.com/jobs/job-links/) are used to let the *user-sim* load testing service send requests to the *front-end* service and to let the main Sock Shop services send traces to the *zipkin* service. Using job links in this fashion simulates how real, cloud-based load testing and APM solutions can be integrated into applications running on Apcera without sacrificing security.
 
 ### Deployment
 
-All of the Socks Shop services and the network are deployed to Apcera with a single script. However, you first need to target your cluster and login to it with APC. After that, just run the deploySocksShop.sh script.
+All of the Sock Shop services and the network are deployed to Apcera with a single script. However, you first need to target your cluster and login to it with APC. After that, just run the deploySocksShop.sh script.
 
 <!-- deploy-doc require-env APCERA_CLUSTER APCERA_USER APCERA_PASSWORD -->
 <!-- deploy-doc-hidden pre-install
@@ -57,13 +57,13 @@ After determining your targeted cluster and default namespace, this script does
 - It sets your current namespace to \<your_default_namespace\>/socksshop.
 - It runs the "apc manifest deploy" command against the socksshop-docker.json manifest to create the services and the socksshop-network virtual network.
 - It creates [job affinity tags](https://docs.apcera.com/jobs/job-affinity/) to make sure that each service that uses a database is deployed to the same Apcera instance manager as the database.
-- It then runs the startSocksShop.sh script to start all of the Socks Shop services.
+- It then runs the startSocksShop.sh script to start all of the Sock Shop services.
 
 Altogether, the script should take under two minutes to run.
 
 ### Using
 
-- You can access the Socks Shop front-end service in a browser with the URL:
+- You can access the Sock Shop front-end service in a browser with the URL:
   - http://front-end.\<your_cluster\>
 - Note that the *edge-router* service is not used since Apcera provides its own router.
 - You can view logs for the services in the Apcera Web Console or by using the "apc app logs" command.
@@ -81,7 +81,7 @@ You can use the startSocksShop.sh and stopSocksShop.sh scripts to start and stop
 
 ### Cleaning up
 
-Run the deleteSocksShop.sh script to delete the Socks Shop services and network.
+Run the deleteSocksShop.sh script to delete the Sock Shop services and network.
 
 <!-- deploy-doc-start destroy-infrastructure -->
 
diff --git a/deployment/ecs-weave-shippable.md b/deployment/ecs-weave-shippable.md
index c1076de..56f8946 100644
--- a/deployment/ecs-weave-shippable.md
+++ b/deployment/ecs-weave-shippable.md
@@ -6,7 +6,7 @@ layout: default
 
 
 ### Goal
-In this scenario, you'll set up and run the containerized Socks Shop
+In this scenario, you'll set up and run the containerized Sock Shop
 eCommerce application, with fully automated deployments, in 30
 minutes or less.
 
@@ -94,7 +94,7 @@ Take note of the following values:
 ### Configure an automated CI/CD pipeline
 
 Your Weave-enabled Amazon ECS cluster should now be running 15 out of the 16 services
-of the Socks Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
+of the Sock Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
 We'll use Shippable to set up an automated CI/CD pipeline to deploy the
 <a href="https://github.com/microservices-demo/front-end" style="color: orange">
 front-end</a> service.
diff --git a/docs/index.md b/docs/index.md
index 5ba304a..a66860d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -7,14 +7,14 @@ layout: default
 
 <h2>Introduction</h2>
 <p>
-  Socks Shop microservices are designed to have minimal expectations, using DNS to find other services.
+  Sock Shop microservices are designed to have minimal expectations, using DNS to find other services.
   This means that it is possible to insert load-balancers and service routers, as required or desired.
 </p>
 <p>
   There are pre-built configuration scripts for various platforms that aim to make running the whole application simple.
 </p>
 <p>
-  Socks Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
+  Sock Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
 </p>
 <p>
   Please let us know how you use it!
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 9311546..687dc28 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -3,7 +3,7 @@ layout: quickstart
 ---
 ## Quick start
 
-  The easiest and fastest way to get started with the Socks Shop application is by using Docker Compose.  If you don't have Docker and Compose installed, 
+  The easiest and fastest way to get started with the Sock Shop application is by using Docker Compose.  If you don't have Docker and Compose installed, 
   please visit the [the Docker website](https://www.docker.com) for instructions on how to install them.
 
 ### Clone the application repository
diff --git a/docs/user-accounts.md b/docs/user-accounts.md
index 05da109..3fcefcf 100644
--- a/docs/user-accounts.md
+++ b/docs/user-accounts.md
@@ -2,7 +2,7 @@
 layout: default
 ---
 <h2>User Accounts</h2>
-<p>To log into Socks Shop and complete a transaction, you'll need credentials. 
+<p>To log into Sock Shop and complete a transaction, you'll need credentials. 
   The 'user' microservice ships with the following accounts.</p>
 <table class="user-creds">
   <thead>
diff --git a/index.html b/index.html
index 7dd737d..31d84d2 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
@@ -23,7 +23,7 @@
 
     <div class="container">
       <div class="header clearfix">
-        <div class="header-home"><a href="/">Socks Shop</a></div>
+        <div class="header-home"><a href="/">Sock Shop</a></div>
         <nav>
           <ul class="nav header-nav">
             <li class=""><a href="/docs/quickstart.html">Quickstart</a></li>
@@ -38,12 +38,12 @@
     <div class="hero-banner">
       <div class="page-container">
         <div class="hero">
-          <h1>Socks Shop</h1>
+          <h1>Sock Shop</h1>
           <h2>A Microservices Demo Application</h2>
           <p class="lead">
-            Socks Shop simulates the user-facing part of an e-commerce website that sells socks. It is intended to aid the demonstration and testing of microservice and cloud native technologies.
+            Sock Shop simulates the user-facing part of an e-commerce website that sells socks. It is intended to aid the demonstration and testing of microservice and cloud native technologies.
           </p>
-          <p>Socks Shop is maintained by <a href="http://weave.works/" target="_blank">Weaveworks</a> and <a href="http://www.container-solutions.com/" target="_blank">Container Solutions</a>.</p>
+          <p>Sock Shop is maintained by <a href="http://weave.works/" target="_blank">Weaveworks</a> and <a href="http://www.container-solutions.com/" target="_blank">Container Solutions</a>.</p>
 
 
           <!-- <p>
@@ -83,13 +83,13 @@ <h2>Tools</h2>
           <div class="col-sm-6">
             <h3>Open Source &amp; Free</h3>
             <p>
-              Socks Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
+              Sock Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
             </p>
           </div>
           <div class="col-sm-6">
-            <h3>Socks Shop on Slack</h3>
+            <h3>Sock Shop on Slack</h3>
             <p>
-              The Weave Community hosts the Socks Shop Slack channel.
+              The Weave Community hosts the Sock Shop Slack channel.
               <a href="https://weaveworks.github.io/community-slack/" target="_blank">Join Slack</a> and tell us how you're using the app.
             </p>
           </div>