diff --git a/client/.prettierignore b/client/.prettierignore
new file mode 100644
index 000000000..1600bef28
--- /dev/null
+++ b/client/.prettierignore
@@ -0,0 +1 @@
+index_template.html
\ No newline at end of file
diff --git a/client/__tests__/e2e/cellxgeneActions.js b/client/__tests__/e2e/cellxgeneActions.js
index 303875e7b..ed305de43 100644
--- a/client/__tests__/e2e/cellxgeneActions.js
+++ b/client/__tests__/e2e/cellxgeneActions.js
@@ -256,7 +256,7 @@ export async function assertGenesetExists(genesetName) {
 
 /*
 
-  GENE
+  SAMPLE
 
 */
 
diff --git a/client/__tests__/reducers/genesets.test.js b/client/__tests__/reducers/genesets.test.js
index ad377f6cd..3177833ad 100644
--- a/client/__tests__/reducers/genesets.test.js
+++ b/client/__tests__/reducers/genesets.test.js
@@ -10,11 +10,11 @@ describe("initial reducer state", () => {
   });
 });
 
-describe("geneset: initial load", () => {
+describe("sampleset: initial load", () => {
   test("missing JSON response", () => {
     expect(() =>
       genesetsReducer(undefined, {
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
       })
     ).toThrow("missing or malformed JSON response");
   });
@@ -22,7 +22,7 @@ describe("geneset: initial load", () => {
   test("empty geneset", () => {
     expect(
       genesetsReducer(undefined, {
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
         data: {
           tid: 0,
           genesets: [],
@@ -38,7 +38,7 @@ describe("geneset: initial load", () => {
   test("non-empty geneset", () => {
     expect(
       genesetsReducer(undefined, {
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
         data: {
           tid: 99,
           genesets: [
@@ -94,9 +94,9 @@ describe("geneset: initial load", () => {
   });
 });
 
-describe("geneset: create", () => {
+describe("sampleset: create", () => {
   const initialState = genesetsReducer(undefined, {
-    type: "geneset: initial load",
+    type: "sampleset: initial load",
     data: {
       tid: 0,
       genesets: [],
@@ -106,7 +106,7 @@ describe("geneset: create", () => {
   test("simple create", () => {
     expect(
       genesetsReducer(initialState, {
-        type: "geneset: create",
+        type: "sampleset: create",
         genesetName: "a geneset",
         genesetDescription: "",
       })
@@ -129,12 +129,12 @@ describe("geneset: create", () => {
     expect(() => {
       genesetsReducer(
         genesetsReducer(initialState, {
-          type: "geneset: create",
+          type: "sampleset: create",
           genesetName: "foo",
           genesetDescription: "foo",
         }),
         {
-          type: "geneset: create",
+          type: "sampleset: create",
           genesetName: "foo",
           genesetDescription: "bar",
         }
@@ -145,22 +145,22 @@ describe("geneset: create", () => {
   test("error - missing required action values", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: create",
+        type: "sampleset: create",
         genesetDescription: "foo",
       });
     }).toThrow();
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: create",
+        type: "sampleset: create",
         genesetName: "foo",
       });
     }).toThrow("name or description unspecified");
   });
 });
 
-describe("geneset: delete", () => {
+describe("sampleset: delete", () => {
   const initialState = genesetsReducer(undefined, {
-    type: "geneset: initial load",
+    type: "sampleset: initial load",
     data: {
       tid: 0,
       genesets: [],
@@ -171,12 +171,12 @@ describe("geneset: delete", () => {
     expect(
       genesetsReducer(
         genesetsReducer(initialState, {
-          type: "geneset: create",
+          type: "sampleset: create",
           genesetName: "foo",
           genesetDescription: "foo",
         }),
         {
-          type: "geneset: delete",
+          type: "sampleset: delete",
           genesetName: "foo",
         }
       )
@@ -190,16 +190,16 @@ describe("geneset: delete", () => {
   test("error - missing name", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: delete",
+        type: "sampleset: delete",
         genesetName: "foo",
       });
     }).toThrow("name does not exist");
   });
 });
 
-describe("geneset: update", () => {
+describe("sampleset: update", () => {
   const initialState = genesetsReducer(undefined, {
-    type: "geneset: initial load",
+    type: "sampleset: initial load",
     data: {
       tid: 0,
       genesets: [],
@@ -211,18 +211,18 @@ describe("geneset: update", () => {
       genesetsReducer(
         genesetsReducer(
           genesetsReducer(initialState, {
-            type: "geneset: create",
+            type: "sampleset: create",
             genesetName: "foo1",
             genesetDescription: "foo1",
           }),
           {
-            type: "geneset: create",
+            type: "sampleset: create",
             genesetName: "foo2",
             genesetDescription: "foo2",
           }
         ),
         {
-          type: "geneset: update",
+          type: "sampleset: update",
           genesetName: "foo1",
           update: {
             genesetName: "bar",
@@ -249,7 +249,7 @@ describe("geneset: update", () => {
   test("error - unknown name", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: update",
+        type: "sampleset: update",
         genesetName: "foo",
         update: {
           genesetName: "foo",
@@ -263,12 +263,12 @@ describe("geneset: update", () => {
     expect(() => {
       genesetsReducer(
         genesetsReducer(initialState, {
-          type: "geneset: create",
+          type: "sampleset: create",
           genesetName: "foo",
           genesetDescription: "foo",
         }),
         {
-          type: "geneset: update",
+          type: "sampleset: update",
           genesetName: "foo",
           update: {
             genesetName: "foo",
@@ -280,17 +280,17 @@ describe("geneset: update", () => {
   });
 });
 
-describe("geneset: add genes", () => {
+describe("sampleset: add samples", () => {
   const initialState = genesetsReducer(
     genesetsReducer(undefined, {
-      type: "geneset: initial load",
+      type: "sampleset: initial load",
       data: {
         tid: 0,
         genesets: [],
       },
     }),
     {
-      type: "geneset: create",
+      type: "sampleset: create",
       genesetName: "test",
       genesetDescription: "",
     }
@@ -299,7 +299,7 @@ describe("geneset: add genes", () => {
   test("add a gene", () => {
     expect(
       genesetsReducer(initialState, {
-        type: "geneset: add genes",
+        type: "sampleset: add samples",
         genesetName: "test",
         genes: [{ geneSymbol: "F5" }],
       })
@@ -319,7 +319,7 @@ describe("geneset: add genes", () => {
 
     expect(
       genesetsReducer(initialState, {
-        type: "geneset: add genes",
+        type: "sampleset: add samples",
         genesetName: "test",
         genes: [
           { geneSymbol: "F5", geneDescription: "desc" },
@@ -347,7 +347,7 @@ describe("geneset: add genes", () => {
   test("no such geneset error", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: add genes",
+        type: "sampleset: add samples",
         genesetName: "mumble",
         genes: [],
       });
@@ -355,24 +355,24 @@ describe("geneset: add genes", () => {
   });
 });
 
-describe("geneset: delete genes", () => {
+describe("sampleset: delete samples", () => {
   const initialState = genesetsReducer(
     genesetsReducer(
       genesetsReducer(undefined, {
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
         data: {
           tid: 0,
           genesets: [],
         },
       }),
       {
-        type: "geneset: create",
+        type: "sampleset: create",
         genesetName: "test",
         genesetDescription: "",
       }
     ),
     {
-      type: "geneset: add genes",
+      type: "sampleset: add samples",
       genesetName: "test",
       genes: [{ geneSymbol: "F5" }],
     }
@@ -381,7 +381,7 @@ describe("geneset: delete genes", () => {
   test("simple", () => {
     expect(
       genesetsReducer(initialState, {
-        type: "geneset: delete genes",
+        type: "sampleset: delete samples",
         genesetName: "test",
         geneSymbols: ["F5"],
       })
@@ -403,7 +403,7 @@ describe("geneset: delete genes", () => {
   test("no such geneset error", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: delete genes",
+        type: "sampleset: delete samples",
         genesetName: "mumble",
         geneSymbols: [],
       });
@@ -411,24 +411,24 @@ describe("geneset: delete genes", () => {
   });
 });
 
-describe("geneset: set gene description", () => {
+describe("sampleset: set sample description", () => {
   const initialState = genesetsReducer(
     genesetsReducer(
       genesetsReducer(undefined, {
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
         data: {
           tid: 0,
           genesets: [],
         },
       }),
       {
-        type: "geneset: create",
+        type: "sampleset: create",
         genesetName: "test",
         genesetDescription: "",
       }
     ),
     {
-      type: "geneset: add genes",
+      type: "sampleset: add samples",
       genesetName: "test",
       genes: [{ geneSymbol: "F5" }],
     }
@@ -437,7 +437,7 @@ describe("geneset: set gene description", () => {
   test("simple set", () => {
     expect(
       genesetsReducer(initialState, {
-        type: "geneset: set gene description",
+        type: "sampleset: set sample description",
         genesetName: "test",
         update: {
           geneSymbol: "F5",
@@ -464,7 +464,7 @@ describe("geneset: set gene description", () => {
   test("no such geneset error", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: set gene description",
+        type: "sampleset: set sample description",
         genesetName: "does not exist",
         update: {
           geneSymbol: "F5",
@@ -477,7 +477,7 @@ describe("geneset: set gene description", () => {
   test("no such gene error", () => {
     expect(() => {
       genesetsReducer(initialState, {
-        type: "geneset: set gene description",
+        type: "sampleset: set sample description",
         genesetName: "test",
         update: {
           geneSymbol: "NO SUCH GENE",
@@ -488,11 +488,11 @@ describe("geneset: set gene description", () => {
   });
 });
 
-describe("geneset: set tid", () => {
+describe("sampleset: set tid", () => {
   test("simple set", () => {
     expect(
       genesetsReducer(undefined, {
-        type: "geneset: set tid",
+        type: "sampleset: set tid",
         tid: 1,
       })
     ).toMatchObject({ lastTid: 1 });
@@ -503,7 +503,7 @@ describe("geneset: set tid", () => {
       genesetsReducer(
         { lastTid: 1 },
         {
-          type: "geneset: set tid",
+          type: "sampleset: set tid",
           tid: "0",
         }
       );
@@ -515,7 +515,7 @@ describe("geneset: set tid", () => {
       genesetsReducer(
         { lastTid: 1 },
         {
-          type: "geneset: set tid",
+          type: "sampleset: set tid",
           tid: 0,
         }
       );
diff --git a/client/__tests__/reducers/genesetsUI.test.js b/client/__tests__/reducers/genesetsUI.test.js
index 0c0ca6a57..b2ac66658 100644
--- a/client/__tests__/reducers/genesetsUI.test.js
+++ b/client/__tests__/reducers/genesetsUI.test.js
@@ -5,7 +5,7 @@ import genesetsUIReducer from "../../src/reducers/genesetsUI";
 const initialState = {
   createGenesetModeActive: false,
   isEditingGenesetName: false,
-  isAddingGenesToGeneset: false,
+  sampleset: false,
 };
 
 /* initial */
@@ -17,58 +17,58 @@ describe("geneset UI states", () => {
       })
     ).toMatchObject(initialState);
   });
-  test("geneset: activate add new geneset mode", () => {
+  test("sampleset: activate add new sampleset mode", () => {
     expect(
       genesetsUIReducer(initialState, {
-        type: "geneset: activate add new geneset mode",
+        type: "sampleset: activate add new sampleset mode",
       })
     ).toMatchObject({
       createGenesetModeActive: true,
       isEditingGenesetName: false,
-      isAddingGenesToGeneset: false,
+      sampleset: false,
     });
   });
-  test("geneset: disable create geneset mode", () => {
+  test("sampleset: disable create sampleset mode", () => {
     expect(
       genesetsUIReducer(undefined, { isEditingGenesetName: false })
     ).toMatchObject(initialState);
   });
 
-  test("activate add new genes mode", () => {
+  test("activate add new samples mode", () => {
     expect(
       genesetsUIReducer(undefined, {
-        type: "geneset: activate add new genes mode",
-        geneset: "a geneset name",
+        type: "sampleset: activate add new samples mode",
+        sampleset: "a sampleset name",
       })
     ).toMatchObject({
       createGenesetModeActive: false,
       isEditingGenesetName: false,
-      isAddingGenesToGeneset: "a geneset name",
+      sampleset: "a sampleset name",
     });
   });
-  test("disable create geneset mode", () => {
+  test("disable create sampleset mode", () => {
     expect(
       genesetsUIReducer(undefined, {
-        type: "geneset: disable create geneset mode",
+        type: "sampleset: disable create sampleset mode",
       })
     ).toMatchObject(initialState);
   });
-  test("activate rename geneset mode", () => {
+  test("activate rename sampleset mode", () => {
     expect(
       genesetsUIReducer(undefined, {
-        type: "geneset: activate rename geneset mode",
-        data: "a geneset name",
+        type: "sampleset: activate rename sampleset mode",
+        data: "a sampleset name",
       })
     ).toMatchObject({
       createGenesetModeActive: false,
-      isEditingGenesetName: "a geneset name",
-      isAddingGenesToGeneset: false,
+      isEditingGenesetName: "a sampleset name",
+      sampleset: false,
     });
   });
-  test("disable rename geneset mode", () => {
+  test("disable rename sampleset mode", () => {
     expect(
       genesetsUIReducer(undefined, {
-        type: "geneset: disable rename geneset mode",
+        type: "sampleset: disable rename sampleset mode",
       })
     ).toMatchObject(initialState);
   });
diff --git a/client/configuration/webpack/obsoleteHTMLTemplate.html b/client/configuration/webpack/obsoleteHTMLTemplate.html
index d5ca7df48..f58847db6 100644
--- a/client/configuration/webpack/obsoleteHTMLTemplate.html
+++ b/client/configuration/webpack/obsoleteHTMLTemplate.html
@@ -22,7 +22,7 @@
 >
   <img
     src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/cellxgene-logo.png"
-    style="width: 320px;"
+    style="width: 320px"
   />
   <div
     style="
@@ -37,36 +37,34 @@
       max-width: 550px;
     "
   >
-    <div style="margin-bottom: 0; font-weight: bolder; font-size: 1.2em;">
+    <div style="margin-bottom: 0; font-weight: bolder; font-size: 1.2em">
       Unsupported Browser
     </div>
-    <div style="margin-top: 0;">
-      cellxgene is currently supported on the following browsers
+    <div style="margin-top: 0">
+      proteinxlocation is currently supported on the following browsers
     </div>
-    <div
-      style="display: flex; justify-content: space-around; margin-top: 16px;"
-    >
+    <div style="display: flex; justify-content: space-around; margin-top: 16px">
       <a
         href="https://www.google.com/chrome/?hl=en%22"
         aria-label="Download Google Chrome"
       >
         <img
           src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/chrome.png"
-          style="width: 80px; height: 80px;"
+          style="width: 80px; height: 80px"
         />
         <div>Chrome &gt; 60</div>
       </a>
       <a href="https://www.mozilla.com/firefox/" aria-label="Download Firefox">
         <img
           src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/firefox.png"
-          style="width: 80px; height: 80px;"
+          style="width: 80px; height: 80px"
         />
         <div>Firefox ≥ 60</div>
       </a>
       <a href="//www.microsoft.com/edge" aria-label="Download Edge">
         <img
           src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/edge.png"
-          style="width: 80px; height: 80px;"
+          style="width: 80px; height: 80px"
         />
         <div>Edge ≥ 79</div>
       </a>
diff --git a/client/index.html b/client/index.html
index 1fd68f2b6..d2ac5bb4b 100644
--- a/client/index.html
+++ b/client/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>CELL&times;GENE | Annotate</title>
+    <title>PROTEIN&times;LOCATION | Annotate</title>
     <style>
       html,
       body,
diff --git a/client/index_template.html b/client/index_template.html
index 671ea6f8e..2c61090e6 100644
--- a/client/index_template.html
+++ b/client/index_template.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>CELL&times;GENE | Annotate</title>
+    <title>PROTEIN&times;LOCATION | Annotate</title>
     <style>
       html,
       body,
@@ -37,27 +37,31 @@
   </head>
   <body>
     <script type="text/javascript">
+      // Global configuration for PROTEINXLOCATION
       window.CELLXGENE = {};
       window.CELLXGENE.API = {
         prefix: `${location.origin}${location.pathname}api/`,
         version: "v0.2/",
       };
     </script>
-    <noscript
-      >If you're seeing this message, that means
+    <noscript>
+      If you're seeing this message, that means
       <strong>JavaScript has been disabled on your browser</strong>, please
       <strong>enable JS</strong> to make this app work.
     </noscript>
 
     <div id="root"></div>
+
+    <!-- Dynamically injected scripts -->
     {% for script in SCRIPTS -%}
-    <script type="text/javascript"
+    <script type="text/javascript" 
       {{ ('integrity="%s"' % script.integrity) | safe if script.integrity }}
       {{ ('crossorigin="%s"' % script.crossorigin) | safe if script.crossorigin }}
-      src="{{script.src | safe}}"
-    ></script>
+      src="{{script.src | safe}}">
+    </script>
     {%- endfor %}
 
+    <!-- Inline scripts included dynamically -->
     {% for ils in INLINE_SCRIPTS %}
     <script type="text/javascript" no-csp-hash>{% include ils %}</script>
     {% endfor %}
diff --git a/client/package.json b/client/package.json
index 3973e0abd..51c5c6ce6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "cellxgene",
+  "name": "proteinxlocation",
   "version": "1.3.0",
   "license": "MIT",
-  "description": "cellxgene is a web application for the interactive exploration of single cell sequence data.",
-  "repository": "https://github.com/chanzuckerberg/cellxgene",
+  "description": "proteinxlocation is a web application for the interactive exploration of single cell sequence data.",
+  "repository": "https://github.com/czbiohub-sf/proteinxlocation",
   "scripts": {
     "build": "npm run clean && webpack --config",
     "clean": "rimraf build",
diff --git a/client/src/actions/annotation.js b/client/src/actions/annotation.js
index ad2f0db57..7b5cbe0a7 100644
--- a/client/src/actions/annotation.js
+++ b/client/src/actions/annotation.js
@@ -142,7 +142,7 @@ export const annotationCreateLabelInCategory =
   (categoryName, labelName, assignSelected) => async (dispatch, getState) => {
     /*
   Add a new label to a user-defined category.  If assignSelected is true, assign
-  the label to all currently selected cells.
+  the label to all currently selected proteins.
   */
     const { annoMatrix: prevAnnoMatrix, obsCrossfilter: prevObsCrossfilter } =
       getState();
@@ -248,7 +248,7 @@ export const annotationLabelCurrentSelection =
     );
 
     dispatch({
-      type: "annotation: label current cell selection",
+      type: "annotation: label current protein selection",
       metadataField: categoryName,
       label: labelName,
       obsCrossfilter,
@@ -363,7 +363,7 @@ export const saveObsAnnotationsAction = () => async (dispatch, getState) => {
 export const saveGenesetsAction = () => async (dispatch, getState) => {
   const state = getState();
 
-  // bail if gene sets not available, or in readonly mode.
+  // bail if sample sets not available, or in readonly mode.
   const { config } = state;
   const { lastTid, genesets } = state.genesets;
 
@@ -374,13 +374,13 @@ export const saveGenesetsAction = () => async (dispatch, getState) => {
   if (!genesetsAreAvailable || genesetsReadonly) {
     // our non-save was completed!
     return dispatch({
-      type: "autosave: genesets complete",
+      type: "autosave: samplesets complete",
       lastSavedGenesets: genesets,
     });
   }
 
   dispatch({
-    type: "autosave: genesets started",
+    type: "autosave: samplesets started",
   });
 
   /* Create the JSON OTA data structure */
@@ -430,24 +430,24 @@ export const saveGenesetsAction = () => async (dispatch, getState) => {
     );
     if (!res.ok) {
       return dispatch({
-        type: "autosave: genesets error",
+        type: "autosave: samplesets error",
         message: `HTTP error ${res.status} - ${res.statusText}`,
         res,
       });
     }
     return Promise.all([
       dispatch({
-        type: "autosave: genesets complete",
+        type: "autosave: samplesets complete",
         lastSavedGenesets: genesets,
       }),
       dispatch({
-        type: "geneset: set tid",
+        type: "sampleset: set tid",
         tid,
       }),
     ]);
   } catch (error) {
     return dispatch({
-      type: "autosave: genesets error",
+      type: "autosave: samplesets error",
       message: error.toString(),
       error,
     });
diff --git a/client/src/actions/geneset.js b/client/src/actions/geneset.js
index 358827578..44881f8a2 100644
--- a/client/src/actions/geneset.js
+++ b/client/src/actions/geneset.js
@@ -1,22 +1,22 @@
 import { postUserErrorToast } from "../components/framework/toasters";
 /*
-Action creators for gene sets
+Action creators for sample sets
 
 Primarily used to keep the crossfilter and underlying data in sync with the UI.
 
 The behavior manifest in these action creators:
 
-    Delete a gene set, will
-      * drop index & clear selection state on the gene set summary
-      * drop index & clear selection state of each gene in the geneset
+    Delete a sample set, will
+      * drop index & clear selection state on the sample set summary
+      * drop index & clear selection state of each sample in the sampleset
 
-    Delete a gene from a gene set, will:
-      * drop index & clear selection state on the gene set summary
-      * drop index & clear selection state on the gene
+    Delete a sample from a sample set, will:
+      * drop index & clear selection state on the sample set summary
+      * drop index & clear selection state on the sample
 
-    Add a gene to a gene set, will:
-      * drop index & clear selection state on the gene set summary
-      * will NOT touch the selection state for the gene
+    Add a sample to a sample set, will:
+      * drop index & clear selection state on the sample set summary
+      * will NOT touch the selection state for the sample
 
 Note that crossfilter indices are lazy created, as needed.
 */
@@ -33,7 +33,7 @@ export const genesetDelete = (genesetName) => (dispatch, getState) => {
     });
   }
   dispatch({
-    type: "geneset: delete",
+    type: "sampleset: delete",
     genesetName,
     obsCrossfilter,
     annoMatrix: obsCrossfilter.annoMatrix,
@@ -51,7 +51,7 @@ export const genesetAddGenes =
     genes = genes.reduce((acc, gene) => {
       if (geneNames.indexOf(gene.geneSymbol) === -1) {
         postUserErrorToast(
-          `${gene.geneSymbol} doesn't appear to be a valid gene name.`
+          `${gene.geneSymbol} doesn't appear to be a valid sample name.`
         );
       } else acc.push(gene);
       return acc;
@@ -68,7 +68,7 @@ export const genesetAddGenes =
       selection: genesetName,
     });
     return dispatch({
-      type: "geneset: add genes",
+      type: "sampleset: add samples",
       genesetName,
       genes,
       obsCrossfilter,
@@ -86,7 +86,7 @@ export const genesetDeleteGenes =
       geneSymbols
     );
     return dispatch({
-      type: "geneset: delete genes",
+      type: "sampleset: delete samples",
       genesetName,
       geneSymbols,
       obsCrossfilter,
diff --git a/client/src/actions/index.js b/client/src/actions/index.js
index 5c5f495d6..6f93c0745 100644
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -61,13 +61,13 @@ async function genesetsFetch(dispatch, config) {
   if (config?.parameters?.annotations_genesets ?? false) {
     fetchJson("genesets").then((response) => {
       dispatch({
-        type: "geneset: initial load",
+        type: "sampleset: initial load",
         data: response ?? defaultResponse,
       });
     });
   } else {
     dispatch({
-      type: "geneset: initial load",
+      type: "sampleset: initial load",
       data: defaultResponse,
     });
   }
@@ -131,7 +131,7 @@ function requestSingleGeneExpressionCountsForColoringPOST(gene) {
 }
 
 const requestUserDefinedGene = (gene) => ({
-  type: "request user defined gene success",
+  type: "request user defined sample success",
   data: {
     genes: [gene],
   },
@@ -141,7 +141,7 @@ const dispatchDiffExpErrors = (dispatch, response) => {
   switch (response.status) {
     case 403:
       dispatchNetworkErrorMessageToUser(
-        "Too many cells selected for differential experesion calculation - please make a smaller selection."
+        "Too many proteins selected for differential experesion calculation - please make a smaller selection."
       );
       break;
     case 501:
@@ -167,7 +167,7 @@ const requestDifferentialExpression =
     try {
       /*
     Steps:
-    1. get the most differentially expressed genes
+    1. get the most differentially expressed samples
     2. get expression data for each
     */
       const { annoMatrix } = getState();
diff --git a/client/src/actions/selection.js b/client/src/actions/selection.js
index 19509dc04..b213e4cd1 100644
--- a/client/src/actions/selection.js
+++ b/client/src/actions/selection.js
@@ -186,7 +186,7 @@ export const setCellSetFromSelection = (cellSetId) => (dispatch, getState) => {
   const selected = obsCrossfilter.allSelectedLabels();
 
   dispatch({
-    type: `store current cell selection as differential set ${cellSetId}`,
+    type: `store current protein selection as differential set ${cellSetId}`,
     data: selected.length > 0 ? selected : null,
   });
 };
diff --git a/client/src/annoMatrix/annoMatrix.js b/client/src/annoMatrix/annoMatrix.js
index 1ed90995a..ecdce9017 100644
--- a/client/src/annoMatrix/annoMatrix.js
+++ b/client/src/annoMatrix/annoMatrix.js
@@ -67,7 +67,7 @@ export default class AnnoMatrix {
       * nObs, nVar - size of each dimension.  These will accurately reflect the
         size of the current annoMatrix view.  For example, if you subset the view,
         the nObs will be smaller.
-      * rowIndex - a rowIndex shared by all data on this view (ie, the list of cells).
+      * rowIndex - a rowIndex shared by all data on this view (ie, the list of proteins).
         The row index labels are as defined by the base dataset from the server.
       * isView - true if this is a view, false if not.
       * viewOf - pointer to parent annomatrix if a view, undefined/null if not a view.
@@ -196,20 +196,20 @@ export default class AnnoMatrix {
 
 		A value query allows for fetching based upon the value in another 
 		field/column, similar to a join.  Currently only supported on the var
-		dimension, allowing query of X columns by var value (eg, gene name)
+		dimension, allowing query of X columns by var value (eg, sample name)
 
 		Examples:
 
     1. Fetch the "n_genes" column the "obs":
 
 			const df = await fetch("obs", "n_genes")
-      console.log("Largest number of genes is: ", df.summarize().max);
+      console.log("Largest number of samples is: ", df.summarize().max);
 
     2. Fetch two separate columns from obs.  Returns a single dataframe containing
        the columns:
 
 			const df = await fetch("obs", ["n_genes", "louvain"])
-      console.log("Cell 0 has category: ", df.at(0, "louvain"));
+      console.log("Protein 0 has category: ", df.at(0, "louvain"));
 
     3. Fetch an entire X (expression counts) column that has a var annotation
        value "TYMP" in the var index.
@@ -272,7 +272,7 @@ export default class AnnoMatrix {
 
     Example:
 
-      addObsAnnoCategory("my cell type", "left toenail") -> AnnoMatrix
+      addObsAnnoCategory("my protein type", "left toenail") -> AnnoMatrix
 
     */
     _subclassResponsibility();
@@ -353,7 +353,7 @@ export default class AnnoMatrix {
 
     Example:
 
-      renameObsColumn('cell type', 'old cell type') -> AnnoMatrix.
+      renameObsColumn('protein type', 'old protein type') -> AnnoMatrix.
 
     */
     _subclassResponsibility();
@@ -363,8 +363,8 @@ export default class AnnoMatrix {
   async setObsColumnValues(col, obsLabels, value) {
     /*
     Set all obs with label in array 'obsLabels' to have 'value'.  Typical use would be
-    to set a group of cells to have a label on a user-created categorical anntoation
-    (eg set all selected cells to have a label).
+    to set a group of proteins to have a label on a user-created categorical anntoation
+    (eg set all selected proteins to have a label).
 
     NOTE: async method, as it may need to fetch.
 
diff --git a/client/src/components/app.js b/client/src/components/app.js
index b91ede883..4ca1a658e 100644
--- a/client/src/components/app.js
+++ b/client/src/components/app.js
@@ -41,7 +41,7 @@ class App extends React.Component {
     const { loading, error, graphRenderCounter } = this.props;
     return (
       <Container>
-        <Helmet title="CELL&times;GENE | Annotate" />
+        <Helmet title="PROTEIN&times;LOCATION | Annotate" />
         {loading ? (
           <div
             style={{
@@ -51,7 +51,7 @@ class App extends React.Component {
               left: window.innerWidth / 2 - 50,
             }}
           >
-            loading cellxgene
+            loading proteinxlocation
           </div>
         ) : null}
         {error ? (
@@ -63,7 +63,7 @@ class App extends React.Component {
               left: window.innerWidth / 2 - 50,
             }}
           >
-            error loading cellxgene
+            error loading proteinxlocation
           </div>
         ) : null}
         {loading || error ? null : (
diff --git a/client/src/components/autosave/index.js b/client/src/components/autosave/index.js
index 441b82ab4..8defb0da2 100644
--- a/client/src/components/autosave/index.js
+++ b/client/src/components/autosave/index.js
@@ -56,7 +56,7 @@ class Autosave extends React.Component {
   };
 
   needToSaveObsAnnotations = () => {
-    /* return true if we need to save obs cell labels, false if we don't */
+    /* return true if we need to save obs protein labels, false if we don't */
     const { annoMatrix, lastSavedAnnoMatrix } = this.props;
     return actions.needToSaveObsAnnotations(annoMatrix, lastSavedAnnoMatrix);
   };
diff --git a/client/src/components/brushableHistogram/footer.js b/client/src/components/brushableHistogram/footer.js
index 3e0380bfe..950453f2c 100644
--- a/client/src/components/brushableHistogram/footer.js
+++ b/client/src/components/brushableHistogram/footer.js
@@ -10,7 +10,7 @@ const HistogramFooter = React.memo(
     rangeColorMax,
     isObs,
     isGeneSetSummary,
-  }) => 
+  }) => (
     /*
     Footer of each histogram.  Will render range and title.
 
@@ -20,44 +20,42 @@ const HistogramFooter = React.memo(
       * range - length two array, [min, max], containing the range values to display
       * rangeColor - length two array, [mincolor, maxcolor], each a CSS color
     */
-     (
-      <div>
-        <div
+    <div>
+      <div
+        style={{
+          display: "flex",
+          justifyContent: hideRanges ? "center" : "space-between",
+        }}
+      >
+        <span
           style={{
-            display: "flex",
-            justifyContent: hideRanges ? "center" : "space-between",
+            color: rangeColorMin,
+            display: hideRanges ? "none" : "block",
           }}
         >
-          <span
-            style={{
-              color: rangeColorMin,
-              display: hideRanges ? "none" : "block",
-            }}
-          >
-            min {rangeMin.toPrecision(4)}
-          </span>
-          <span
-            data-testclass="brushable-histogram-field-name"
-            style={{ fontStyle: "italic" }}
-          >
-            {isObs && displayName}
-            {isGeneSetSummary && "gene set mean expression"}
-          </span>
-          <div style={{ display: hideRanges ? "block" : "none" }}>
-            : {rangeMin}
-          </div>
-          <span
-            style={{
-              color: rangeColorMax,
-              display: hideRanges ? "none" : "block",
-            }}
-          >
-            max {rangeMax.toPrecision(4)}
-          </span>
+          min {rangeMin.toPrecision(4)}
+        </span>
+        <span
+          data-testclass="brushable-histogram-field-name"
+          style={{ fontStyle: "italic" }}
+        >
+          {isObs && displayName}
+          {isGeneSetSummary && "sample set mean expression"}
+        </span>
+        <div style={{ display: hideRanges ? "block" : "none" }}>
+          : {rangeMin}
         </div>
+        <span
+          style={{
+            color: rangeColorMax,
+            display: hideRanges ? "none" : "block",
+          }}
+        >
+          max {rangeMax.toPrecision(4)}
+        </span>
       </div>
-    )
-  
+    </div>
+  )
 );
 
 export default HistogramFooter;
diff --git a/client/src/components/brushableHistogram/index.js b/client/src/components/brushableHistogram/index.js
index de2a694c2..59e577a3f 100644
--- a/client/src/components/brushableHistogram/index.js
+++ b/client/src/components/brushableHistogram/index.js
@@ -90,53 +90,50 @@ class HistogramBrush extends React.PureComponent {
   };
 
   onBrushEnd = (selection, x) => () => {
-      const { dispatch, field, isObs, isUserDefined, isGeneSetSummary } =
-        this.props;
-      const minAllowedBrushSize = 10;
-      const smallAmountToAvoidInfiniteLoop = 0.1;
+    const { dispatch, field, isObs, isUserDefined, isGeneSetSummary } =
+      this.props;
+    const minAllowedBrushSize = 10;
+    const smallAmountToAvoidInfiniteLoop = 0.1;
+
+    // ignore programmatically generated events
+    if (!d3.event.sourceEvent) return;
+    // ignore cascading events, which are programmatically generated
+    if (d3.event.sourceEvent.sourceEvent) return;
+
+    let type;
+    let range = null;
+    if (d3.event.selection) {
+      type = "continuous metadata histogram end";
+      if (d3.event.selection[1] - d3.event.selection[0] > minAllowedBrushSize) {
+        range = [x(d3.event.selection[0]), x(d3.event.selection[1])];
+      } else {
+        /* the user selected range is too small and will be hidden #587, so take control of it procedurally */
+        /* https://stackoverflow.com/questions/12354729/d3-js-limit-size-of-brush */
 
-      // ignore programmatically generated events
-      if (!d3.event.sourceEvent) return;
-      // ignore cascading events, which are programmatically generated
-      if (d3.event.sourceEvent.sourceEvent) return;
+        const procedurallyResizedBrushWidth =
+          d3.event.selection[0] +
+          minAllowedBrushSize +
+          smallAmountToAvoidInfiniteLoop; //
 
-      let type;
-      let range = null;
-      if (d3.event.selection) {
-        type = "continuous metadata histogram end";
-        if (
-          d3.event.selection[1] - d3.event.selection[0] >
-          minAllowedBrushSize
-        ) {
-          range = [x(d3.event.selection[0]), x(d3.event.selection[1])];
-        } else {
-          /* the user selected range is too small and will be hidden #587, so take control of it procedurally */
-          /* https://stackoverflow.com/questions/12354729/d3-js-limit-size-of-brush */
-
-          const procedurallyResizedBrushWidth =
-            d3.event.selection[0] +
-            minAllowedBrushSize +
-            smallAmountToAvoidInfiniteLoop; //
-
-          range = [x(d3.event.selection[0]), x(procedurallyResizedBrushWidth)];
-        }
-      } else {
-        type = "continuous metadata histogram cancel";
+        range = [x(d3.event.selection[0]), x(procedurallyResizedBrushWidth)];
       }
+    } else {
+      type = "continuous metadata histogram cancel";
+    }
 
-      const query = this.createQuery();
-      const otherProps = {
-        selection: field,
-        continuousNamespace: {
-          isObs,
-          isUserDefined,
-          isGeneSetSummary,
-        },
-      };
-      dispatch(
-        actions.selectContinuousMetadataAction(type, query, range, otherProps)
-      );
+    const query = this.createQuery();
+    const otherProps = {
+      selection: field,
+      continuousNamespace: {
+        isObs,
+        isUserDefined,
+        isGeneSetSummary,
+      },
     };
+    dispatch(
+      actions.selectContinuousMetadataAction(type, query, range, otherProps)
+    );
+  };
 
   handleSetGeneAsScatterplotX = () => {
     const { dispatch, field } = this.props;
@@ -163,7 +160,7 @@ class HistogramBrush extends React.PureComponent {
       isScatterplotYYaccessor,
     } = this.props;
     dispatch({
-      type: "clear user defined gene",
+      type: "clear user defined sample",
       data: field,
     });
     if (isColorAccessor) {
diff --git a/client/src/components/categorical/annoSelect.js b/client/src/components/categorical/annoSelect.js
index 6d184e0a2..9b650b391 100644
--- a/client/src/components/categorical/annoSelect.js
+++ b/client/src/components/categorical/annoSelect.js
@@ -27,13 +27,13 @@ class DuplicateCategorySelect extends React.PureComponent {
           }
           filterable={false}
           itemRenderer={(d, { handleClick }) => (
-              <MenuItem
-                data-testclass="duplicate-category-dropdown-option"
-                onClick={handleClick}
-                key={d}
-                text={d}
-              />
-            )}
+            <MenuItem
+              data-testclass="duplicate-category-dropdown-option"
+              onClick={handleClick}
+              key={d}
+              text={d}
+            />
+          )}
           noResults={<MenuItem disabled text="No results." />}
           onItemSelect={(d) => {
             handleModalDuplicateCategorySelection(d);
@@ -42,7 +42,7 @@ class DuplicateCategorySelect extends React.PureComponent {
           {/* children become the popover target; render value here */}
           <Button
             data-testid="duplicate-category-dropdown"
-            text={categoryToDuplicate || "None (all cells 'unassigned')"}
+            text={categoryToDuplicate || "None (all proteins 'unassigned')"}
             rightIcon="double-caret-vertical"
           />
         </Select>
diff --git a/client/src/components/categorical/category/annoDialogAddLabel.js b/client/src/components/categorical/category/annoDialogAddLabel.js
index 729b2034a..12b86f106 100644
--- a/client/src/components/categorical/category/annoDialogAddLabel.js
+++ b/client/src/components/categorical/category/annoDialogAddLabel.js
@@ -60,7 +60,8 @@ class Category extends React.PureComponent {
     return isLabelErroneous(name, metadataField, schema);
   };
 
-  instruction = (label) => labelPrompt(this.labelNameError(label), "New, unique label", ":");
+  instruction = (label) =>
+    labelPrompt(this.labelNameError(label), "New, unique label", ":");
 
   handleChangeOrSelect = (label) => {
     this.setState({ newLabelText: label });
@@ -85,7 +86,7 @@ class Category extends React.PureComponent {
           instruction={this.instruction(newLabelText)}
           cancelTooltipContent="Close this dialog without adding a label."
           primaryButtonText="Add label"
-          secondaryButtonText={`Add label & assign ${obsCrossfilter.countSelected()} selected cells`}
+          secondaryButtonText={`Add label & assign ${obsCrossfilter.countSelected()} selected proteins`}
           handleSecondaryButtonSubmit={this.addLabelAndAssignCells}
           text={newLabelText}
           validationError={this.labelNameError(newLabelText)}
diff --git a/client/src/components/categorical/category/index.js b/client/src/components/categorical/category/index.js
index 3d78a1db5..53df229f2 100644
--- a/client/src/components/categorical/category/index.js
+++ b/client/src/components/categorical/category/index.js
@@ -443,7 +443,7 @@ const CategoryHeader = React.memo(
             isUserAnno={isUserAnno}
             createText="Add a new label to this category"
             editText="Edit this category's name"
-            deleteText="Delete this category, all associated labels, and remove all cell assignments"
+            deleteText="Delete this category, all associated labels, and remove all protein assignments"
           />
 
           <Tooltip
diff --git a/client/src/components/categorical/value/index.js b/client/src/components/categorical/value/index.js
index a20585a15..5c497a783 100644
--- a/client/src/components/categorical/value/index.js
+++ b/client/src/components/categorical/value/index.js
@@ -122,7 +122,8 @@ class CategoryValue extends React.Component {
     return isLabelErroneous(name, metadataField, schema);
   };
 
-  instruction = (label) => labelPrompt(this.labelNameError(label), "New, unique label", ":");
+  instruction = (label) =>
+    labelPrompt(this.labelNameError(label), "New, unique label", ":");
 
   activateEditLabelMode = () => {
     const { dispatch, metadataField, categoryIndex, label } = this.props;
@@ -268,7 +269,7 @@ class CategoryValue extends React.Component {
   ) => {
     /*
       Knowing that colorScale is based off continuous data,
-      createHistogramBins fetches the continuous data in relation to the cells relevant to the category value.
+      createHistogramBins fetches the continuous data in relation to the proteins relevant to the category value.
       It then separates that data into 50 bins for drawing the mini-histogram
     */
     const groupBy = categoryData.col(metadataField);
@@ -310,7 +311,7 @@ class CategoryValue extends React.Component {
   ) => {
     /*
       Knowing that the color scale is based off of categorical data,
-      createOccupancyStack obtains a map showing the number if cells per colored value
+      createOccupancyStack obtains a map showing the number if proteins per colored value
       Using the colorScale a stack of colored bars is drawn representing the map
      */
     const groupBy = categoryData.col(metadataField);
@@ -350,16 +351,16 @@ class CategoryValue extends React.Component {
   isAddCurrentSelectionDisabled(crossfilter, category, value) {
     /*
     disable "add current selection to label", if one of the following is true:
-    1. no cells are selected
-    2. all currently selected cells already have this label, on this category
+    1. no proteins are selected
+    2. all currently selected proteins already have this label, on this category
     */
     const { categoryData } = this.props;
 
-    // 1. no cells selected?
+    // 1. no proteins selected?
     if (crossfilter.countSelected() === 0) {
       return true;
     }
-    // 2. all selected cells already have the label
+    // 2. all selected proteins already have the label
     const mask = crossfilter.allSelectedMask();
     if (
       AnnotationsHelpers.allHaveLabelByMask(categoryData, category, value, mask)
@@ -436,7 +437,7 @@ class CategoryValue extends React.Component {
     if (
       !this.shouldRenderStackedBarOrHistogram ||
       // This function returns true on categorical annotations(when stacked bar should not render),
-      //  in cases where the colorAccessor is a gene this function will return undefined since genes do not live on the schema
+      //  in cases where the colorAccessor is a sample this function will return undefined since samples do not live on the schema
       AnnotationsHelpers.isCategoricalAnnotation(schema, colorAccessor) === true
     ) {
       return null;
diff --git a/client/src/components/categorical/value/occupancy.js b/client/src/components/categorical/value/occupancy.js
index a1993084b..156e7f89a 100644
--- a/client/src/components/categorical/value/occupancy.js
+++ b/client/src/components/categorical/value/occupancy.js
@@ -19,7 +19,7 @@ class Occupancy extends React.PureComponent {
   createHistogram = () => {
     /*
       Knowing that colorScale is based off continous data,
-      createHistogram fetches the continous data in relation to the cells releveant to the catagory value.
+      createHistogram fetches the continous data in relation to the proteins releveant to the catagory value.
       It then seperates that data into 50 bins for drawing the mini-histogram
     */
     const { metadataField, categoryData, colorData, categoryValue } =
@@ -72,7 +72,7 @@ class Occupancy extends React.PureComponent {
   createOccupancyStack = () => {
     /*
       Knowing that the color scale is based off of catagorical data,
-      createOccupancyStack obtains a map showing the number if cells per colored value
+      createOccupancyStack obtains a map showing the number if proteins per colored value
       Using the colorScale a stack of colored bars is drawn representing the map
      */
     const {
diff --git a/client/src/components/embedding/index.js b/client/src/components/embedding/index.js
index a36d32561..ea0f03c8c 100644
--- a/client/src/components/embedding/index.js
+++ b/client/src/components/embedding/index.js
@@ -16,10 +16,10 @@ import actions from "../../actions";
 import { getDiscreteCellEmbeddingRowIndex } from "../../util/stateManager/viewStackHelpers";
 
 @connect((state) => ({
-    layoutChoice: state.layoutChoice, // TODO: really should clean up naming, s/layout/embedding/g
-    schema: state.annoMatrix?.schema,
-    crossfilter: state.obsCrossfilter,
-  }))
+  layoutChoice: state.layoutChoice, // TODO: really should clean up naming, s/layout/embedding/g
+  schema: state.annoMatrix?.schema,
+  crossfilter: state.obsCrossfilter,
+}))
 class Embedding extends React.PureComponent {
   constructor(props) {
     super(props);
@@ -62,7 +62,7 @@ class Embedding extends React.PureComponent {
                 }}
               >
                 {layoutChoice?.current}: {crossfilter.countSelected()} out of{" "}
-                {crossfilter.size()} cells
+                {crossfilter.size()} proteins
               </Button>
             </Tooltip>
           }
@@ -81,7 +81,8 @@ class Embedding extends React.PureComponent {
             >
               <H4>Embedding Choice</H4>
               <p style={{ fontStyle: "italic" }}>
-                There are {schema?.dataframe?.nObs} cells in the entire dataset.
+                There are {schema?.dataframe?.nObs} proteins in the entire
+                dataset.
               </p>
               <EmbeddingChoices
                 onChange={this.handleLayoutChoiceChange}
@@ -136,7 +137,7 @@ const EmbeddingChoices = ({ onChange, annoMatrix, layoutChoice }) => {
       <RadioGroup onChange={onChange} selectedValue={layoutChoice.current}>
         {data.map((summary) => {
           const { discreteCellIndex, embeddingName } = summary;
-          const sizeHint = `${discreteCellIndex.size()} cells`;
+          const sizeHint = `${discreteCellIndex.size()} proteins`;
           return (
             <Radio
               label={`${embeddingName}: ${sizeHint}`}
diff --git a/client/src/components/framework/logo.js b/client/src/components/framework/logo.js
index 3b7d3881c..b15dca2c7 100644
--- a/client/src/components/framework/logo.js
+++ b/client/src/components/framework/logo.js
@@ -8,8 +8,8 @@ const Logo = (props) => {
       src={icon}
       height={size}
       width={size}
-      alt="CELLxGENE Annotate Logo"
-     />
+      alt="PROTEINxLOCATION Annotate Logo"
+    />
   );
 };
 
diff --git a/client/src/components/framework/toasters.js b/client/src/components/framework/toasters.js
index 17f00baff..e8c31733f 100644
--- a/client/src/components/framework/toasters.js
+++ b/client/src/components/framework/toasters.js
@@ -18,7 +18,7 @@ export const postUserErrorToast = (message) =>
 
 /*
 A toast the user must dismiss manually, because they need to act on its information,
-ie., 8 bulk add genes out of 40 were bad. Manually see which ones and fix.
+ie., 8 bulk add samples out of 40 were bad. Manually see which ones and fix.
 */
 export const keepAroundErrorToast = (message) =>
   ToastTopCenter?.show({ message, timeout: 0, intent: Intent.WARNING });
diff --git a/client/src/components/geneExpression/geneSet.js b/client/src/components/geneExpression/geneSet.js
index ced7cd592..af371e4a7 100644
--- a/client/src/components/geneExpression/geneSet.js
+++ b/client/src/components/geneExpression/geneSet.js
@@ -45,7 +45,7 @@ class GeneSet extends React.Component {
   render() {
     const { setName, genesetDescription, setGenes } = this.props;
     const { isOpen } = this.state;
-    const genesetNameLengthVisible = 150; /* this magic number determines how much of a long geneset name we see */
+    const genesetNameLengthVisible = 150; /* this magic number determines how much of a long sampleset name we see */
     const genesetIsEmpty = setGenes.size === 0;
     let testClass = "geneset-expand";
 
@@ -112,7 +112,7 @@ class GeneSet extends React.Component {
         <div style={{ marginLeft: 15, marginTop: 5, marginRight: 0 }}>
           {isOpen && genesetIsEmpty && (
             <p style={{ fontStyle: "italic", color: "lightgrey" }}>
-              No genes to display
+              No samples to display
             </p>
           )}
         </div>
diff --git a/client/src/components/geneExpression/index.js b/client/src/components/geneExpression/index.js
index 735c0d60b..64531b90e 100644
--- a/client/src/components/geneExpression/index.js
+++ b/client/src/components/geneExpression/index.js
@@ -8,8 +8,8 @@ import QuickGene from "./quickGene";
 import CreateGenesetDialogue from "./menus/createGenesetDialogue";
 
 @connect((state) => ({
-    genesets: state.genesets.genesets,
-  }))
+  genesets: state.genesets.genesets,
+}))
 class GeneExpression extends React.Component {
   constructor(props) {
     super(props);
@@ -36,14 +36,17 @@ class GeneExpression extends React.Component {
   handleActivateCreateGenesetMode = () => {
     const { dispatch } = this.props;
     const { geneSetsExpanded } = this.state;
-    dispatch({ type: "geneset: activate add new geneset mode" });
+    dispatch({ type: "sampleset: activate add new sampleset mode" });
     if (!geneSetsExpanded) {
       this.setState((state) => ({ ...state, geneSetsExpanded: true }));
     }
   };
 
   handleExpandGeneSets = () => {
-    this.setState((state) => ({ ...state, geneSetsExpanded: !state.geneSetsExpanded }));
+    this.setState((state) => ({
+      ...state,
+      geneSetsExpanded: !state.geneSetsExpanded,
+    }));
   };
 
   render() {
diff --git a/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js b/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js
index 04310362b..6c173fc20 100644
--- a/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js
+++ b/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js
@@ -19,7 +19,7 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
   disableAddGeneMode = () => {
     const { dispatch } = this.props;
     dispatch({
-      type: "geneset: disable add new genes mode",
+      type: "sampleset: disable add new samples mode",
     });
   };
 
@@ -39,7 +39,7 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
 
     dispatch(actions.genesetAddGenes(geneset, genesTmpHardcodedFormat));
     dispatch({
-      type: "geneset: disable add new genes mode",
+      type: "sampleset: disable add new samples mode",
     });
     if (e) e.preventDefault();
   };
@@ -60,10 +60,10 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
           primaryButtonProps={{
             "data-testid": `${geneset}:submit-gene`,
           }}
-          title="Add genes to gene set"
-          instruction={`Add genes to ${geneset}`}
-          cancelTooltipContent="Close this dialog without adding genes to gene set."
-          primaryButtonText="Add genes"
+          title="Add samples to sample set"
+          instruction={`Add samples to ${geneset}`}
+          cancelTooltipContent="Close this dialog without adding samples to sample set."
+          primaryButtonText="Add samples"
           text={genesToAdd}
           validationError={false}
           annoInput={
diff --git a/client/src/components/geneExpression/menus/addGenes.js b/client/src/components/geneExpression/menus/addGenes.js
index ca1833da9..2eff69210 100644
--- a/client/src/components/geneExpression/menus/addGenes.js
+++ b/client/src/components/geneExpression/menus/addGenes.js
@@ -50,10 +50,10 @@ const filterGenes = (query, genes) =>
   });
 
 @connect((state) => ({
-    annoMatrix: state.annoMatrix,
-    userDefinedGenes: state.controls.userDefinedGenes,
-    userDefinedGenesLoading: state.controls.userDefinedGenesLoading,
-  }))
+  annoMatrix: state.annoMatrix,
+  userDefinedGenes: state.controls.userDefinedGenes,
+  userDefinedGenesLoading: state.controls.userDefinedGenesLoading,
+}))
 class AddGenes extends React.Component {
   constructor(props) {
     super(props);
@@ -80,17 +80,17 @@ class AddGenes extends React.Component {
     if (!g) return;
     const gene = g.target;
     if (userDefinedGenes.indexOf(gene) !== -1) {
-      postUserErrorToast("That gene already exists");
+      postUserErrorToast("That sample already exists");
     } else if (userDefinedGenes.length > globals.maxUserDefinedGenes) {
       postUserErrorToast(
-        `That's too many genes, you can have at most ${globals.maxUserDefinedGenes} user defined genes`
+        `That's too many samples, you can have at most ${globals.maxUserDefinedGenes} user defined samples`
       );
     } else if (geneNames.indexOf(gene) === undefined) {
-      postUserErrorToast("That doesn't appear to be a valid gene name.");
+      postUserErrorToast("That doesn't appear to be a valid sample name.");
     } else {
-      dispatch({ type: "single user defined gene start" });
+      dispatch({ type: "single user defined sample start" });
       dispatch(actions.requestUserDefinedGene(gene));
-      dispatch({ type: "single user defined gene complete" });
+      dispatch({ type: "single user defined sample complete" });
     }
   }
 
@@ -118,7 +118,7 @@ class AddGenes extends React.Component {
     if (bulkAdd !== "") {
       const genes = parseBulkGeneString(bulkAdd);
       if (genes.length === 0) {
-        return keepAroundErrorToast("Must enter a gene name.");
+        return keepAroundErrorToast("Must enter a sample name.");
       }
       // These gene lists are unique enough where memoization is useless
       const upperGenes = this._genesToUpper(genes);
@@ -126,12 +126,12 @@ class AddGenes extends React.Component {
 
       const upperGeneNames = this._memoGenesToUpper(geneNames);
 
-      dispatch({ type: "bulk user defined gene start" });
+      dispatch({ type: "bulk user defined sample start" });
 
       Promise.all(
         [...upperGenes.keys()].map((upperGene) => {
           if (upperUserDefinedGenes.get(upperGene) !== undefined) {
-            return keepAroundErrorToast("That gene already exists");
+            return keepAroundErrorToast("That sample already exists");
           }
 
           const indexOfGene = upperGeneNames.get(upperGene);
@@ -140,7 +140,7 @@ class AddGenes extends React.Component {
             return keepAroundErrorToast(
               `${
                 genes[upperGenes.get(upperGene)]
-              } doesn't appear to be a valid gene name.`
+              } doesn't appear to be a valid sample name.`
             );
           }
           return dispatch(
@@ -148,8 +148,8 @@ class AddGenes extends React.Component {
           );
         })
       ).then(
-        () => dispatch({ type: "bulk user defined gene complete" }),
-        () => dispatch({ type: "bulk user defined gene error" })
+        () => dispatch({ type: "bulk user defined sample complete" }),
+        () => dispatch({ type: "bulk user defined sample error" })
       );
     }
 
@@ -180,10 +180,10 @@ class AddGenes extends React.Component {
 
   placeholderGeneNames() {
     /*
-    return a string containing gene name suggestions for use as a user hint.
+    return a string containing sample name suggestions for use as a user hint.
     Eg.,    Apod, Cd74, ...
-    Will return a max of 3 genes, totalling 15 characters in length.
-    Randomly selects gene names.
+    Will return a max of 3 samples, totalling 15 characters in length.
+    Randomly selects sample names.
 
     NOTE: the random selection means it will re-render constantly.
     */
@@ -231,7 +231,7 @@ class AddGenes extends React.Component {
               this.setState({ tab: "autosuggest" });
             }}
           >
-            Autosuggest genes
+            Autosuggest samples
           </Button>
           <Button
             active={tab === "bulkadd"}
@@ -242,7 +242,7 @@ class AddGenes extends React.Component {
               this.setState({ tab: "bulkadd" });
             }}
           >
-            Bulk add genes
+            Bulk add samples
           </Button>
         </div>
         {tab === "autosuggest" ? (
@@ -257,18 +257,18 @@ class AddGenes extends React.Component {
               closeOnSelect
               resetOnClose
               itemDisabled={userDefinedGenesLoading ? () => true : () => false}
-              noResults={<MenuItem disabled text="No matching genes." />}
+              noResults={<MenuItem disabled text="No matching samples." />}
               onItemSelect={(g) => {
                 /* this happens on 'enter' */
                 this.handleClick(g);
               }}
-              initialContent={<MenuItem disabled text="Enter a gene…" />}
+              initialContent={<MenuItem disabled text="Enter a sample…" />}
               inputProps={{ "data-testid": "gene-search" }}
               inputValueRenderer={() => ""}
               itemListPredicate={filterGenes}
               onActiveItemChange={(item) => this.setState({ activeItem: item })}
               itemRenderer={renderGene}
-              items={geneNames || ["No genes"]}
+              items={geneNames || ["No samples"]}
               popoverProps={{ minimal: true }}
             />
             <Button
@@ -277,7 +277,7 @@ class AddGenes extends React.Component {
               loading={userDefinedGenesLoading}
               onClick={() => this.handleClick(activeItem)}
             >
-              Add gene
+              Add sample
             </Button>
           </ControlGroup>
         ) : null}
@@ -290,7 +290,7 @@ class AddGenes extends React.Component {
               }}
             >
               <FormGroup
-                helperText="Add a list of genes (comma delimited)"
+                helperText="Add a list of samples (comma delimited)"
                 labelFor="text-input-bulk-add"
               >
                 <ControlGroup>
@@ -308,7 +308,7 @@ class AddGenes extends React.Component {
                     onClick={this.handleBulkAddClick}
                     loading={userDefinedGenesLoading}
                   >
-                    Add genes
+                    Add samples
                   </Button>
                 </ControlGroup>
               </FormGroup>
diff --git a/client/src/components/geneExpression/menus/createGenesetDialogue.js b/client/src/components/geneExpression/menus/createGenesetDialogue.js
index 1c12383d3..922972235 100644
--- a/client/src/components/geneExpression/menus/createGenesetDialogue.js
+++ b/client/src/components/geneExpression/menus/createGenesetDialogue.js
@@ -33,7 +33,7 @@ class CreateGenesetDialogue extends React.PureComponent {
       nameErrorMessage: "",
     });
     dispatch({
-      type: "geneset: disable create geneset mode",
+      type: "sampleset: disable create sampleset mode",
     });
     if (e) e.preventDefault();
   };
@@ -44,7 +44,7 @@ class CreateGenesetDialogue extends React.PureComponent {
       this.state;
 
     dispatch({
-      type: "geneset: create",
+      type: "sampleset: create",
       genesetName: genesetName.trim(),
       genesetDescription,
     });
@@ -65,7 +65,7 @@ class CreateGenesetDialogue extends React.PureComponent {
       dispatch(actions.genesetAddGenes(genesetName, genesTmpHardcodedFormat));
     }
     dispatch({
-      type: "geneset: disable create geneset mode",
+      type: "sampleset: disable create sampleset mode",
     });
     this.setState({
       genesetName: "",
@@ -92,13 +92,13 @@ class CreateGenesetDialogue extends React.PureComponent {
 
   instruction = (genesetName, genesets) =>
     genesets.has(genesetName)
-      ? "Gene set name must be unique."
-      : "New, unique gene set name";
+      ? "Sample set name must be unique."
+      : "New, unique sample set name";
 
   validate = (genesetName, genesets) => {
     if (genesets.has(genesetName)) {
       this.setState({
-        nameErrorMessage: "There is already a gene set with that name",
+        nameErrorMessage: "There is already a sample set with that name",
       });
       return false;
     }
@@ -110,7 +110,7 @@ class CreateGenesetDialogue extends React.PureComponent {
     ) {
       this.setState({
         nameErrorMessage:
-          "Gene set names can only contain alphanumeric characters and the following special characters: ! ” # $ % ’ ( ) * + , - . / : ; < = > ? @  ] ^ _ ` | ~",
+          "Sample set names can only contain alphanumeric characters and the following special characters: ! ” # $ % ’ ( ) * + , - . / : ; < = > ? @  ] ^ _ ` | ~",
       });
       return false;
     }
@@ -128,7 +128,7 @@ class CreateGenesetDialogue extends React.PureComponent {
       <>
         <Dialog
           icon="tag"
-          title="Create gene set"
+          title="Create sample set"
           isOpen={genesetsUI.createGenesetModeActive}
           onClose={this.disableCreateGenesetMode}
         >
@@ -148,7 +148,7 @@ class CreateGenesetDialogue extends React.PureComponent {
                     intent: "none",
                     autoFocus: true,
                   }}
-                  newLabelMessage="Create gene set"
+                  newLabelMessage="Create sample set"
                 />
                 <p
                   style={{
@@ -162,7 +162,7 @@ class CreateGenesetDialogue extends React.PureComponent {
                 <p style={{ marginTop: 20 }}>
                   Optionally add a{" "}
                   <span style={{ fontWeight: 700 }}>description</span> for this
-                  gene set
+                  sample set
                 </p>
                 <LabelInput
                   onChange={this.handleDescriptionInputChange}
@@ -171,13 +171,13 @@ class CreateGenesetDialogue extends React.PureComponent {
                     intent: "none",
                     autoFocus: false,
                   }}
-                  newLabelMessage="Add geneset description"
+                  newLabelMessage="Add sampleset description"
                 />
 
                 <p style={{ marginTop: 20 }}>
                   Optionally add a list of comma separated{" "}
-                  <span style={{ fontWeight: 700 }}>genes</span> to populate the
-                  gene set
+                  <span style={{ fontWeight: 700 }}>samples</span> to populate
+                  the sample set
                 </p>
                 <LabelInput
                   onChange={this.handleGenesetInputChange}
@@ -186,13 +186,13 @@ class CreateGenesetDialogue extends React.PureComponent {
                     intent: "none",
                     autoFocus: false,
                   }}
-                  newLabelMessage="populate geneset with genes"
+                  newLabelMessage="populate sampleset with samples"
                 />
               </div>
             </div>
             <div className={Classes.DIALOG_FOOTER}>
               <div className={Classes.DIALOG_FOOTER_ACTIONS}>
-                <Tooltip2 content="Close this dialog without creating a new gene set.">
+                <Tooltip2 content="Close this dialog without creating a new sample set.">
                   <Button onClick={this.disableCreateGenesetMode}>
                     Cancel
                   </Button>
@@ -204,7 +204,7 @@ class CreateGenesetDialogue extends React.PureComponent {
                   intent="primary"
                   type="submit"
                 >
-                  Create gene set
+                  Create sample set
                 </Button>
               </div>
             </div>
diff --git a/client/src/components/geneExpression/menus/editGenesetNameDialogue.js b/client/src/components/geneExpression/menus/editGenesetNameDialogue.js
index 039677829..df6331367 100644
--- a/client/src/components/geneExpression/menus/editGenesetNameDialogue.js
+++ b/client/src/components/geneExpression/menus/editGenesetNameDialogue.js
@@ -28,7 +28,7 @@ class RenameGeneset extends React.PureComponent {
       newGenesetDescription: originalGenesetDescription,
     });
     dispatch({
-      type: "geneset: disable rename geneset mode",
+      type: "sampleset: disable rename sampleset mode",
     });
     if (e) e.preventDefault();
   };
@@ -38,7 +38,7 @@ class RenameGeneset extends React.PureComponent {
     const { newGenesetName, newGenesetDescription } = this.state;
 
     dispatch({
-      type: "geneset: update",
+      type: "sampleset: update",
       genesetName: genesetsUI.isEditingGenesetName,
       update: {
         genesetName: newGenesetName,
@@ -46,7 +46,7 @@ class RenameGeneset extends React.PureComponent {
       },
     });
     dispatch({
-      type: "geneset: disable rename geneset mode",
+      type: "sampleset: disable rename sampleset mode",
     });
     e.preventDefault();
   };
@@ -73,7 +73,7 @@ class RenameGeneset extends React.PureComponent {
       genesets.has(newGenesetName)
     ) {
       this.setState({
-        nameErrorMessage: `There is already a gene set with that name`,
+        nameErrorMessage: `There is already a sample set with that name`,
       });
       return true;
     }
@@ -83,7 +83,7 @@ class RenameGeneset extends React.PureComponent {
     ) {
       this.setState({
         nameErrorMessage:
-          "Gene set names can only contain alphanumeric characters and the following special characters: ! ” # $ % ’ ( ) * + , - . / : ; < = > ? @  ] ^ _ ` | ~",
+          "Sample set names can only contain alphanumeric characters and the following special characters: ! ” # $ % ’ ( ) * + , - . / : ; < = > ? @  ] ^ _ ` | ~",
       });
       return true;
     }
@@ -118,14 +118,14 @@ class RenameGeneset extends React.PureComponent {
           primaryButtonProps={{
             "data-testid": `${genesetsUI.isEditingGenesetName}:submit-geneset`,
           }}
-          title="Edit gene set name and description"
+          title="Edit sample set name and description"
           instruction={
             <>
               Rename <b>{genesetsUI.isEditingGenesetName}</b>
             </>
           }
-          cancelTooltipContent="Close this dialog without renaming the gene set."
-          primaryButtonText="Edit gene set name and description"
+          cancelTooltipContent="Close this dialog without renaming the sample set."
+          primaryButtonText="Edit sample set name and description"
           text={newGenesetName}
           secondaryText={newGenesetDescription}
           validationError={this.validate(
@@ -153,7 +153,7 @@ class RenameGeneset extends React.PureComponent {
             <LabelInput
               label={newGenesetDescription}
               onChange={this.handleChangeDescription}
-              inputProps={{ "data-testid": "change geneset description" }}
+              inputProps={{ "data-testid": "change sampleset description" }}
               intent="none"
               autoFocus={false}
             />
diff --git a/client/src/components/geneExpression/menus/genesetMenus.js b/client/src/components/geneExpression/menus/genesetMenus.js
index eb30db33f..b5666c46d 100644
--- a/client/src/components/geneExpression/menus/genesetMenus.js
+++ b/client/src/components/geneExpression/menus/genesetMenus.js
@@ -45,7 +45,7 @@ class GenesetMenus extends React.PureComponent {
     annoMatrix
       .fetch(
         ...createColorQuery(
-          "color by geneset mean expression",
+          "color by sampleset mean expression",
           geneset,
           schema,
           genesets
@@ -57,7 +57,7 @@ class GenesetMenus extends React.PureComponent {
   activateAddGeneToGenesetMode = () => {
     const { dispatch, geneset } = this.props;
     dispatch({
-      type: "geneset: activate add new genes mode",
+      type: "sampleset: activate add new samples mode",
       geneset,
     });
   };
@@ -66,7 +66,7 @@ class GenesetMenus extends React.PureComponent {
     const { dispatch, geneset } = this.props;
 
     dispatch({
-      type: "geneset: activate rename geneset mode",
+      type: "sampleset: activate rename sampleset mode",
       data: geneset,
     });
   };
@@ -75,7 +75,7 @@ class GenesetMenus extends React.PureComponent {
     const { dispatch, geneset } = this.props;
     this.fetchOurData(); // just in case data was flushed from cache
     dispatch({
-      type: "color by geneset mean expression",
+      type: "color by sampleset mean expression",
       geneset,
     });
   };
@@ -122,7 +122,7 @@ class GenesetMenus extends React.PureComponent {
                     data-testclass="activateEditGenesetNameMode"
                     data-testid={`${geneset}:edit-genesetName-mode`}
                     onClick={this.activateEditGenesetNameMode}
-                    text="Edit gene set name and description"
+                    text="Edit sample set name and description"
                   />
                   <MenuItem
                     icon="trash"
@@ -130,7 +130,7 @@ class GenesetMenus extends React.PureComponent {
                     data-testclass="handleDeleteGeneset"
                     data-testid={`${geneset}:delete-geneset`}
                     onClick={this.handleDeleteGeneset}
-                    text="Delete this gene set (destructive, will remove set and collection of genes)"
+                    text="Delete this sample set (destructive, will remove set and collection of samples)"
                   />
                 </Menu>
               }
@@ -145,7 +145,7 @@ class GenesetMenus extends React.PureComponent {
               />
             </Popover>
             <Tooltip2
-              content={`Color by gene set ${geneset} mean`}
+              content={`Color by sample set ${geneset} mean`}
               position={Position.BOTTOM}
               hoverOpenDelay={globals.tooltipHoverOpenDelay}
             >
diff --git a/client/src/components/geneExpression/quickGene.js b/client/src/components/geneExpression/quickGene.js
index 1eb9296d1..15640fc6e 100644
--- a/client/src/components/geneExpression/quickGene.js
+++ b/client/src/components/geneExpression/quickGene.js
@@ -27,10 +27,10 @@ function QuickGene() {
 
   const { annoMatrix, userDefinedGenes, userDefinedGenesLoading } = useSelector(
     (state) => ({
-        annoMatrix: state.annoMatrix,
-        userDefinedGenes: state.controls.userDefinedGenes,
-        userDefinedGenesLoading: state.controls.userDefinedGenesLoading,
-      })
+      annoMatrix: state.annoMatrix,
+      userDefinedGenes: state.controls.userDefinedGenes,
+      userDefinedGenesLoading: state.controls.userDefinedGenesLoading,
+    })
   );
 
   const prevProps = usePrevious({ annoMatrix });
@@ -81,13 +81,13 @@ function QuickGene() {
     if (!g) return;
     const gene = g.target;
     if (userDefinedGenes.indexOf(gene) !== -1) {
-      postUserErrorToast("That gene already exists");
+      postUserErrorToast("That sample already exists");
     } else if (geneNames.indexOf(gene) === undefined) {
-      postUserErrorToast("That doesn't appear to be a valid gene name.");
+      postUserErrorToast("That doesn't appear to be a valid sample name.");
     } else {
-      dispatch({ type: "single user defined gene start" });
+      dispatch({ type: "single user defined sample start" });
       dispatch(actions.requestUserDefinedGene(gene));
-      dispatch({ type: "single user defined gene complete" });
+      dispatch({ type: "single user defined sample complete" });
     }
   };
 
@@ -99,17 +99,23 @@ function QuickGene() {
     });
 
   const removeGene = (gene) => () => {
-    dispatch({ type: "clear user defined gene", data: gene });
+    dispatch({ type: "clear user defined sample", data: gene });
   };
 
-  const QuickGenes = useMemo(() => userDefinedGenes.reverse().map((gene) => (
-        <Gene
-          key={`quick=${gene}`}
-          gene={gene}
-          removeGene={removeGene}
-          quickGene
-        />
-      )), [userDefinedGenes]);
+  const QuickGenes = useMemo(
+    () =>
+      userDefinedGenes
+        .reverse()
+        .map((gene) => (
+          <Gene
+            key={`quick=${gene}`}
+            gene={gene}
+            removeGene={removeGene}
+            quickGene
+          />
+        )),
+    [userDefinedGenes]
+  );
 
   return (
     <div style={{ width: "100%", marginBottom: "16px" }}>
@@ -138,22 +144,22 @@ function QuickGene() {
               closeOnSelect
               resetOnClose
               itemDisabled={userDefinedGenesLoading ? () => true : () => false}
-              noResults={<MenuItem disabled text="No matching genes." />}
+              noResults={<MenuItem disabled text="No matching samples." />}
               onItemSelect={(g) => {
                 /* this happens on 'enter' */
                 handleClick(g);
               }}
-              initialContent={<MenuItem disabled text="Enter a gene…" />}
+              initialContent={<MenuItem disabled text="Enter a sample…" />}
               inputProps={{
                 "data-testid": "gene-search",
-                placeholder: "Quick Gene Search",
+                placeholder: "Quick Sample Search",
                 leftIcon: IconNames.SEARCH,
                 fill: true,
               }}
               inputValueRenderer={() => ""}
               itemListPredicate={filterGenes}
               itemRenderer={renderGene}
-              items={geneNames || ["No genes"]}
+              items={geneNames || ["No samples"]}
               popoverProps={{ minimal: true }}
               fill
             />
diff --git a/client/src/components/graph/graph.js b/client/src/components/graph/graph.js
index 5b16003d7..e9bb5ccae 100644
--- a/client/src/components/graph/graph.js
+++ b/client/src/components/graph/graph.js
@@ -317,7 +317,10 @@ class Graph extends React.Component {
     if (e.type !== "wheel") e.preventDefault();
     if (camera.handleEvent(e, projectionTF)) {
       this.renderCanvas();
-      this.setState((state) => ({ ...state, updateOverlay: !state.updateOverlay }));
+      this.setState((state) => ({
+        ...state,
+        updateOverlay: !state.updateOverlay,
+      }));
     }
   };
 
@@ -438,7 +441,7 @@ class Graph extends React.Component {
   handleOpacityRangeChange(e) {
     const { dispatch } = this.props;
     dispatch({
-      type: "change opacity deselected cells in 2d graph background",
+      type: "change opacity deselected proteins in 2d graph background",
       data: e.target.value,
     });
   }
@@ -951,32 +954,29 @@ const ErrorLoading = ({ displayName, error, width, height }) => {
   );
 };
 
-const StillLoading = ({ displayName, width, height }) => 
+const StillLoading = ({ displayName, width, height }) => (
   /*
   Render a busy/loading indicator
   */
-   (
+  <div
+    style={{
+      position: "fixed",
+      fontWeight: 500,
+      top: height / 2,
+      width,
+    }}
+  >
     <div
       style={{
-        position: "fixed",
-        fontWeight: 500,
-        top: height / 2,
-        width,
+        display: "flex",
+        justifyContent: "center",
+        justifyItems: "center",
+        alignItems: "center",
       }}
     >
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "center",
-          justifyItems: "center",
-          alignItems: "center",
-        }}
-      >
-        <Button minimal loading intent="primary" />
-        <span style={{ fontStyle: "italic" }}>Loading {displayName}</span>
-      </div>
+      <Button minimal loading intent="primary" />
+      <span style={{ fontStyle: "italic" }}>Loading {displayName}</span>
     </div>
-  )
-;
-
+  </div>
+);
 export default Graph;
diff --git a/client/src/components/leftSidebar/infoMenu.js b/client/src/components/leftSidebar/infoMenu.js
index 7d1ee9fae..5db987205 100644
--- a/client/src/components/leftSidebar/infoMenu.js
+++ b/client/src/components/leftSidebar/infoMenu.js
@@ -23,7 +23,7 @@ const InformationMenu = React.memo((props) => {
             rel="noopener"
           />
           <MenuItem
-            href="https://github.com/chanzuckerberg/cellxgene"
+            href="https://github.com/czbiohub-sf/proteinxlocation"
             target="_blank"
             icon="git-branch"
             text="Github"
diff --git a/client/src/components/leftSidebar/topLeftLogoAndTitle.js b/client/src/components/leftSidebar/topLeftLogoAndTitle.js
index 5de741a24..aad208313 100644
--- a/client/src/components/leftSidebar/topLeftLogoAndTitle.js
+++ b/client/src/components/leftSidebar/topLeftLogoAndTitle.js
@@ -60,7 +60,7 @@ class LeftSideBar extends React.Component {
               userSelect: "none",
             }}
           >
-            cell
+            protein
             <span
               style={{
                 position: "relative",
@@ -71,7 +71,7 @@ class LeftSideBar extends React.Component {
             >
               ×
             </span>
-            gene
+            location
           </span>
         </div>
         <div style={{ marginRight: 5, height: "100%" }}>
diff --git a/client/src/components/menubar/cellSetButtons.js b/client/src/components/menubar/cellSetButtons.js
index f1d915a4f..da94df83e 100644
--- a/client/src/components/menubar/cellSetButtons.js
+++ b/client/src/components/menubar/cellSetButtons.js
@@ -38,7 +38,7 @@ class CellSetButton extends React.PureComponent {
           <span data-testid={`cellset-count-${eitherCellSetOneOrTwo}`}>
             {cellsSelected}
           </span>
-          {" cells"}
+          {" proteins"}
         </AnchorButton>
       </Tooltip>
     );
diff --git a/client/src/components/menubar/diffexpButtons.js b/client/src/components/menubar/diffexpButtons.js
index 6dbb6eb62..7785ac3e3 100644
--- a/client/src/components/menubar/diffexpButtons.js
+++ b/client/src/components/menubar/diffexpButtons.js
@@ -39,7 +39,7 @@ class DiffexpButtons extends React.PureComponent {
       : "";
     const tipMessage = `See top differentially expressed genes${slowMsg}`;
     const tipMessageWarn = `The total number of cells for differential expression computation
-                            may not exceed ${diffexpCellcountMax}. Try reselecting new cell sets.`;
+                            may not exceed ${diffexpCellcountMax}. Try reselecting new protein sets.`;
 
     const warnMaxSizeExceeded =
       haveEitherCellSet &&
diff --git a/client/src/components/menubar/subset.js b/client/src/components/menubar/subset.js
index 03025cb3c..9160966ed 100644
--- a/client/src/components/menubar/subset.js
+++ b/client/src/components/menubar/subset.js
@@ -14,7 +14,7 @@ const Subset = React.memo((props) => {
   return (
     <ButtonGroup className={styles.menubarButton}>
       <Tooltip
-        content="Subset to currently selected cells and associated metadata"
+        content="Subset to currently selected proteins and associated metadata"
         position="bottom"
         hoverOpenDelay={globals.tooltipHoverOpenDelay}
       >
@@ -27,7 +27,7 @@ const Subset = React.memo((props) => {
         />
       </Tooltip>
       <Tooltip
-        content="Undo subset and show all cells and associated metadata"
+        content="Undo subset and show all proteins and associated metadata"
         position="bottom"
         hoverOpenDelay={globals.tooltipHoverOpenDelay}
       >
diff --git a/client/src/components/scatterplot/scatterplot.js b/client/src/components/scatterplot/scatterplot.js
index 3f9e66d3b..de178d714 100644
--- a/client/src/components/scatterplot/scatterplot.js
+++ b/client/src/components/scatterplot/scatterplot.js
@@ -47,7 +47,7 @@ const getYScale = memoize(getScale);
     colors: state.colors,
     pointDilation: state.pointDilation,
 
-    // Accessors are var/gene names (strings)
+    // Accessors are var/sample names (strings)
     scatterplotXXaccessor,
     scatterplotYYaccessor,
 
@@ -218,9 +218,9 @@ class Scatterplot extends React.PureComponent {
   };
 
   getViewportDimensions = () => ({
-      height: window.innerHeight,
-      width: window.innerWidth,
-    });
+    height: window.innerHeight,
+    width: window.innerWidth,
+  });
 
   handleResize = () => {
     const { state } = this.state;
diff --git a/client/src/reducers/autosave.js b/client/src/reducers/autosave.js
index 26d67387d..ade2bd3d0 100644
--- a/client/src/reducers/autosave.js
+++ b/client/src/reducers/autosave.js
@@ -1,10 +1,10 @@
 const Autosave = (
   state = {
-    // cell labels
+    // protein labels
     obsAnnotationSaveInProgress: false,
     lastSavedAnnoMatrix: null,
 
-    // gene sets
+    // sample sets
     genesetSaveInProgress: false,
     lastSavedGenesets: null,
 
@@ -49,7 +49,7 @@ const Autosave = (
       };
     }
 
-    case "geneset: initial load": {
+    case "sampleset: initial load": {
       return {
         ...state,
         genesetSaveInProgress: false,
@@ -57,14 +57,14 @@ const Autosave = (
       };
     }
 
-    case "autosave: genesets started": {
+    case "autosave: samplesets started": {
       return {
         ...state,
         genesetSaveInProgress: true,
       };
     }
 
-    case "autosave: genesets error": {
+    case "autosave: samplesets error": {
       return {
         ...state,
         genesetSaveInProgress: false,
@@ -72,7 +72,7 @@ const Autosave = (
       };
     }
 
-    case "autosave: genesets complete": {
+    case "autosave: samplesets complete": {
       const { lastSavedGenesets } = action;
       return {
         ...state,
diff --git a/client/src/reducers/categoricalSelection.js b/client/src/reducers/categoricalSelection.js
index d10806998..98e24860a 100644
--- a/client/src/reducers/categoricalSelection.js
+++ b/client/src/reducers/categoricalSelection.js
@@ -57,7 +57,7 @@ const CategoricalSelection = (state, action, nextSharedState) => {
       return newState;
     }
 
-    case "annotation: label current cell selection":
+    case "annotation: label current protein selection":
     case "annotation: add new label to category":
     case "annotation: label edited":
     case "annotation: delete label": {
diff --git a/client/src/reducers/colors.js b/client/src/reducers/colors.js
index a9afdecc4..5e8ec789e 100644
--- a/client/src/reducers/colors.js
+++ b/client/src/reducers/colors.js
@@ -81,7 +81,7 @@ const ColorsReducer = (
       };
     }
 
-    case "color by geneset mean expression": {
+    case "color by sampleset mean expression": {
       /* toggle between this mode and reset */
       const resetCurrent =
         action.type === state.colorMode &&
diff --git a/client/src/reducers/controls.js b/client/src/reducers/controls.js
index 6770e4d7b..526a4e076 100644
--- a/client/src/reducers/controls.js
+++ b/client/src/reducers/controls.js
@@ -59,13 +59,13 @@ const Controls = (
         userDefinedGenesLoading: true,
       };
     }
-    case "request user defined gene error": {
+    case "request user defined sample error": {
       return {
         ...state,
         userDefinedGenesLoading: false,
       };
     }
-    case "request user defined gene success": {
+    case "request user defined sample success": {
       const { userDefinedGenes } = state;
       const _userDefinedGenes = uniq(
         userDefinedGenes.concat(action.data.genes)
@@ -76,7 +76,7 @@ const Controls = (
         userDefinedGenesLoading: false,
       };
     }
-    case "clear user defined gene": {
+    case "clear user defined sample": {
       const { userDefinedGenes } = state;
       const newUserDefinedGenes = filter(
         userDefinedGenes,
@@ -103,7 +103,7 @@ const Controls = (
         ...state,
         graphInteractionMode: action.data,
       };
-    case "change opacity deselected cells in 2d graph background":
+    case "change opacity deselected proteins in 2d graph background":
       return {
         ...state,
         opacityForDeselectedCells: action.data,
diff --git a/client/src/reducers/differential.js b/client/src/reducers/differential.js
index 6401cce7e..4267da9f2 100644
--- a/client/src/reducers/differential.js
+++ b/client/src/reducers/differential.js
@@ -26,12 +26,12 @@ const Differential = (
         loading: false,
         error: action.data,
       };
-    case "store current cell selection as differential set 1":
+    case "store current protein selection as differential set 1":
       return {
         ...state,
         celllist1: action.data,
       };
-    case "store current cell selection as differential set 2":
+    case "store current protein selection as differential set 2":
       return {
         ...state,
         celllist2: action.data,
diff --git a/client/src/reducers/genesets.js b/client/src/reducers/genesets.js
index 94356ce99..e8789d56f 100644
--- a/client/src/reducers/genesets.js
+++ b/client/src/reducers/genesets.js
@@ -1,9 +1,9 @@
 /**
- * Gene set state. Geneset UI state is in a different reducer.
+ * Sample set state. Sampleset UI state is in a different reducer.
  *
- * geneset reducer state is a Map object, where:
- *  key: the geneset name, a string.
- *  val: the geneset defined as an object ("geneset object")
+ * sampleset reducer state is a Map object, where:
+ *  key: the sampleset name, a string.
+ *  val: the sampleset defined as an object ("geneset object")
  *
  * A geneset object is:
  * {
@@ -15,12 +15,12 @@
  *    }>
  * }
  *
- * Geneset and genes Map order is significant, and will be preserved across
+ * Sampleset and samples Map order is significant, and will be preserved across
  * CRUD operations on either.
  *
  * This reducer does light error checking, but not as much as the backend
- * routes. Do not rely on it to enforce geneset integrity - eg, no duplicate
- * genes in a geneset.
+ * routes. Do not rely on it to enforce sampleset integrity - eg, no duplicate
+ * samples in a sampleset.
  */
 import { diffexpPopNamePrefix1, diffexpPopNamePrefix2 } from "../globals";
 
@@ -36,11 +36,11 @@ const GeneSets = (
     /**
      * Initial, load-time bootstrap.
      * {
-     *    type: "geneset: initial load"
+     *    type: "sampleset: initial load"
      *    data: JSON response
      * }
      */
-    case "geneset: initial load": {
+    case "sampleset: initial load": {
       const { data } = action;
 
       if (
@@ -79,24 +79,26 @@ const GeneSets = (
     }
 
     /**
-     * Creates a new & empty geneset with the given name and description.
+     * Creates a new & empty sampleset with the given name and description.
      * {
-     *    type: "geneset: create",
-     *    genesetName: string, // gene set name
-     *    genesetDescription: string, // geneset description
+     *    type: "sampleset: create",
+     *    genesetName: string, // sample set name
+     *    genesetDescription: string, // sampleset description
      * }
      *
      */
-    case "geneset: create": {
+    case "sampleset: create": {
       const { genesetName, genesetDescription } = action;
       if (
         typeof genesetName !== "string" ||
         !genesetName ||
         genesetDescription === undefined
       )
-        throw new Error("geneset: create -- name or description unspecified.");
+        throw new Error(
+          "sampleset: create -- name or description unspecified."
+        );
       if (state.genesets.has(genesetName))
-        throw new Error("geneset: create -- name already defined.");
+        throw new Error("sampleset: create -- name already defined.");
 
       const genesets = new Map([
         [
@@ -108,7 +110,7 @@ const GeneSets = (
           },
         ],
         ...state.genesets,
-      ]); // clone and add new geneset to beginning
+      ]); // clone and add new sampleset to beginning
 
       return {
         ...state,
@@ -117,16 +119,16 @@ const GeneSets = (
     }
 
     /**
-     * Deletes the named geneset, if it exists. Throws if it does not.
+     * Deletes the named sampleset, if it exists. Throws if it does not.
      * {
-     *    type: "geneset: delete",
+     *    type: "sampleset: delete",
      *    genesetName: string
      * }
      */
-    case "geneset: delete": {
+    case "sampleset: delete": {
       const { genesetName } = action;
       if (!state.genesets.has(genesetName))
-        throw new Error("geneset: delete -- geneset name does not exist.");
+        throw new Error("sampleset: delete -- geneset name does not exist.");
 
       const genesets = new Map(state.genesets); // clone
       genesets.delete(genesetName);
@@ -137,10 +139,10 @@ const GeneSets = (
     }
 
     /**
-     * Update the named geneset with a new name and description.  Preserves the existing
-     * order of the geneset, even when the genesetName changes.
+     * Update the named sampleset with a new name and description.  Preserves the existing
+     * order of the sampleset, even when the samplesetName changes.
      * {
-     *    type: "geneset: update",
+     *    type: "sampleset: update",
      *    genesetName: string, current name of geneset to be updated
      *    update: {
      *        genesetName: string, new name
@@ -150,12 +152,12 @@ const GeneSets = (
      *
      * For example, if you want to update JUST the description:
      *   dispatch({
-     *     action: "geneset: update",
+     *     action: "sampleset: update",
      *     genesetName: "foo",
      *     update: { genesetName: "foo", genesetDescription: "a new description"}
      *   })
      */
-    case "geneset: update": {
+    case "sampleset: update": {
       const { genesetName, update } = action;
 
       if (
@@ -164,7 +166,7 @@ const GeneSets = (
         !state.genesets.has(genesetName)
       )
         throw new Error(
-          "geneset: update -- geneset name unspecified or does not exist."
+          "sampleset: update -- geneset name unspecified or does not exist."
         );
 
       /* now that we've confirmed the gene set exists, check for duplicates */
@@ -176,7 +178,7 @@ const GeneSets = (
 
       if (genesetNameIsDuplicate && descriptionIsDuplicate)
         throw new Error(
-          "geneset: update -- update specified existing name and description."
+          "sampleset: update -- update specified existing name and description."
         );
 
       const prevGs = state.genesets.get(genesetName);
@@ -199,11 +201,11 @@ const GeneSets = (
     }
 
     /**
-     * Adds genes to the geneset.  They are appended to the END of the geneset, in the
-     * order provided. Duplicates or genes already in the geneset, will be ignored.
+     * Adds samples to the sampleset.  They are appended to the END of the sampleset, in the
+     * order provided. Duplicates or samples already in the sampleset, will be ignored.
      * {
-     *    type: "geneset: add genes"
-     *    genesetName: <string>, // gene set name
+     *    type: "sampleset: add samples"
+     *    genesetName: <string>, // sample set name
      *    genes: Array<{
      *      geneSymbol: <string>,
      *      geneDescription: <string>
@@ -213,15 +215,17 @@ const GeneSets = (
      * Example:
      *   dispatch({
      *     type: "add genes",
-     *     genesetName: "foo",
+     *     samplesetName: "foo",
      *     genes: [ { geneSymbol: "FOXP", geneDescription: "test" }]
      *   });
      */
-    case "geneset: add genes": {
+    case "sampleset: add samples": {
       const { genesetName, genes } = action;
 
       if (!state.genesets.has(genesetName))
-        throw new Error("geneset: add genes -- geneset name does not exist.");
+        throw new Error(
+          "sampleset: add samples -- sampleset name does not exist."
+        );
 
       // clone
       const genesets = new Map(state.genesets);
@@ -251,26 +255,26 @@ const GeneSets = (
     }
 
     /**
-     * Delete genes from the named geneset. Will throw if the genesetName does
+     * Delete samples from the named sampleset. Will throw if the samplesetName does
      * not exist.  Will ignore geneSymbols that do not exist.
      * {
-     *    type: "geneset: delete genes",
+     *    type: "sampleset: delete samples",
      *    genesetName: <string>, // the geneset from which to delete genes
      *    geneSymbols: [<string>, ...], // the gene symbols to delete.
      * }
      *
      * Example:
      *  dispatch({
-     *    type: "geneset: delete genes",
+     *    type: "sampleset: delete samples",
      *    genesetName: "a geneset name",
      *    geneSymbols: ["F5"]
      *  })
      */
-    case "geneset: delete genes": {
+    case "sampleset: delete samples": {
       const { genesetName, geneSymbols } = action;
       if (!state.genesets.has(genesetName))
         throw new Error(
-          "geneset: delete genes -- geneset name does not exist."
+          "sampleset: delete samples -- geneset name does not exist."
         );
 
       // clone
@@ -293,22 +297,22 @@ const GeneSets = (
     }
 
     /**
-     * Set/update the description of the gene.  NOTE that this does not allow the name
-     * of the gene to change - only "geneset: add" and "geneset: delete" can change
-     * the genes in a geneset.  Use this to update a gene description AFTER you add it
-     * to the geneset.
+     * Set/update the description of the sample.  NOTE that this does not allow the name
+     * of the sample to change - only "sampleset: add" and "sampleset: delete" can change
+     * the samples in a sampleset.  Use this to update a sample description AFTER you add it
+     * to the sampleset.
      * {
-     *    type: "geneset: set gene description",
-     *    genesetName: <string>, // the geneset to update
+     *    type: "sampleset: set sample description",
+     *    genesetName: <string>, // the sampleset to update
      *    update: {
-     *      geneSymbol: <string>, // the gene to update, MUST exist already in the geneset
+     *      geneSymbol: <string>, // the sample to update, MUST exist already in the sampleset
      *      geneDescription: <string>
      *    }
      * }
      *
      * Example:
      *  dispatch({
-     *      type: "geneset: set gene description",
+     *      type: "sampleset: set sample description",
      *      genesetName: "my fav geneset",
      *      update: {
      *        geneSymbol: "F5",
@@ -316,11 +320,11 @@ const GeneSets = (
      *      }
      *  })
      */
-    case "geneset: set gene description": {
+    case "sampleset: set sample description": {
       const { genesetName, update } = action;
       if (!state.genesets.has(genesetName))
         throw new Error(
-          "geneset: set gene description -- geneset name does not exist."
+          "sampleset: set sample description -- geneset name does not exist."
         );
 
       // clone
@@ -334,7 +338,7 @@ const GeneSets = (
       const { geneSymbol, geneDescription } = update;
       const gene = gs.genes.get(geneSymbol);
       if (!gene)
-        throw new Error("geneset: set gene description -- no such gene");
+        throw new Error("sampleset: set sample description -- no such gene");
       gs.genes.set(geneSymbol, {
         geneSymbol,
         geneDescription,
@@ -349,7 +353,7 @@ const GeneSets = (
     /**
      * Used by autosave to update the server synchronization TID
      */
-    case "geneset: set tid": {
+    case "sampleset: set tid": {
       const { tid } = action;
       if (!Number.isInteger(tid) || tid < 0)
         throw new Error("TID must be a positive integer number");
diff --git a/client/src/reducers/genesetsUI.js b/client/src/reducers/genesetsUI.js
index a49aa9b92..8eda1639f 100644
--- a/client/src/reducers/genesetsUI.js
+++ b/client/src/reducers/genesetsUI.js
@@ -1,5 +1,5 @@
 /*
-Reducers for geneset UI-state.
+Reducers for sampleset UI-state.
 */
 const GeneSetsUI = (
   state = {
@@ -11,58 +11,58 @@ const GeneSetsUI = (
 ) => {
   switch (action.type) {
     /**
-     * Activate interface for adding a new geneset
+     * Activate interface for adding a new sampleset
      * No params, if the action is fired we flip
      * a boolean here.
      */
-    case "geneset: activate add new geneset mode": {
+    case "sampleset: activate add new sampleset mode": {
       return {
         ...state,
         createGenesetModeActive: true,
       };
     }
     /**
-     * Disable interface for adding a new geneset
+     * Disable interface for adding a new sampleset
      * No params, if the action is fired we flip
      * a boolean here.
      */
-    case "geneset: disable create geneset mode": {
+    case "sampleset: disable create sampleset mode": {
       return {
         ...state,
         createGenesetModeActive: false,
       };
     }
     /**
-     * Activate the interface for adding new genes to a geneset
+     * Activate the interface for adding new samples to a sampleset
      * isAddingGenesToGeneset {
-     *  geneset: string, name of geneset
+     *  sampleset: string, name of geneset
      * },
      */
-    case "geneset: activate add new genes mode": {
+    case "sampleset: activate add new samples mode": {
       return {
         ...state,
         isAddingGenesToGeneset: action.geneset,
       };
     }
     /**
-     * Disable the interface for adding new genes to a geneset
+     * Disable the interface for adding new samples to a sampleset
      * No params, if the action is fired we flip
      * a boolean here.
      */
-    case "geneset: disable add new genes mode": {
+    case "sampleset: disable add new samples mode": {
       return {
         ...state,
         isAddingGenesToGeneset: false,
       };
     }
     /**
-     * Activate the interface for renaming a geneset
+     * Activate the interface for renaming a sampleset
      * isEditingGenesetName: {
-     *   type: "geneset: activate rename geneset mode",
-     *   data: geneset, // a string, name of geneset
+     *   type: "sampleset: activate rename sampleset mode",
+     *   data: geneset, // a string, name of sampleset
      * }
      */
-    case "geneset: activate rename geneset mode": {
+    case "sampleset: activate rename sampleset mode": {
       return {
         ...state,
         isEditingGenesetName: action.data,
@@ -73,7 +73,7 @@ const GeneSetsUI = (
      * No params, if the action is fired we flip
      * a boolean here.
      */
-    case "geneset: disable rename geneset mode": {
+    case "sampleset: disable rename sampleset mode": {
       return {
         ...state,
         isEditingGenesetName: false,
diff --git a/client/src/reducers/undoableConfig.js b/client/src/reducers/undoableConfig.js
index d18270add..cc9b2412e 100644
--- a/client/src/reducers/undoableConfig.js
+++ b/client/src/reducers/undoableConfig.js
@@ -17,13 +17,13 @@ const skipOnActions = new Set([
   "window resize",
   "reset colorscale",
   "reset centroid labels",
-  "geneset: initial load",
-  "geneset: set tid",
+  "sampleset: initial load",
+  "sampleset: set tid",
 
   "graph brush change",
   "continuous metadata histogram brush",
 
-  "request user defined gene success",
+  "request user defined sample success",
 
   "category value mouse hover start",
   "category value mouse hover end",
@@ -32,9 +32,9 @@ const skipOnActions = new Set([
   "writable obs annotations - save complete",
   "writable obs annotations - save started",
   "writable obs annotations - save error",
-  "autosave: genesets started",
-  "autosave: genesets error",
-  "autosave: genesets complete",
+  "autosave: samplesets started",
+  "autosave: samplesets error",
+  "autosave: samplesets complete",
 
   /* annotation component action */
   "annotation: activate add new label mode",
@@ -45,13 +45,13 @@ const skipOnActions = new Set([
   "annotation: cancel edit label mode",
   "set annotations collection name",
 
-  /* geneset component action */
-  "geneset: activate add new geneset mode",
-  "geneset: disable create geneset mode",
-  "geneset: activate add new genes mode",
-  "geneset: disable add new genes mode",
-  "geneset: activate rename geneset mode",
-  "geneset: disable rename geneset mode",
+  /* sampleset component action */
+  "sampleset: activate add new sampleset mode",
+  "sampleset: disable create sampleset mode",
+  "sampleset: activate add new samples mode",
+  "sampleset: disable add new samples mode",
+  "sampleset: activate rename sampleset mode",
+  "sampleset: disable rename sampleset mode",
 ]);
 
 /*
@@ -80,15 +80,15 @@ const saveOnActions = new Set([
   "color by categorical metadata",
   "color by continuous metadata",
   "color by expression",
-  "color by geneset mean expression",
+  "color by sampleset mean expression",
 
   "show centroid labels for category",
 
   "set scatterplot x",
   "set scatterplot y",
 
-  "store current cell selection as differential set 1",
-  "store current cell selection as differential set 2",
+  "store current protein selection as differential set 1",
+  "store current protein selection as differential set 2",
 
   "subset to selection",
   "set clip quantiles",
@@ -101,17 +101,17 @@ const saveOnActions = new Set([
   "annotation: add new label to category",
   "annotation: delete category",
   "annotation: label edited",
-  "annotation: label current cell selection",
+  "annotation: label current protein selection",
   "annotation: delete label",
   "annotation: category edited",
 
-  /* geneset component action */
-  "geneset: create",
-  "geneset: delete",
-  "geneset: update",
-  "geneset: add genes",
-  "geneset: delete genes",
-  "geneset: set gene description",
+  /* sampleset component action */
+  "sampleset: create",
+  "sampleset: delete",
+  "sampleset: update",
+  "sampleset: add samples",
+  "sampleset: delete samples",
+  "sampleset: set sample description",
 ]);
 
 /**
diff --git a/client/src/reducers/undoableFsm.js b/client/src/reducers/undoableFsm.js
index 4a66e9ae5..886a17b2f 100644
--- a/client/src/reducers/undoableFsm.js
+++ b/client/src/reducers/undoableFsm.js
@@ -26,171 +26,171 @@ const createFsmTransitions = (
   clear,
   save
 ) => [
-    /* graph selection brushing */
-    {
-      event: "graph brush start",
-      from: "init",
-      to: "graph brush in progress",
-      action: stashPending,
-    },
-    {
-      event: "graph brush cancel",
-      from: "graph brush in progress",
-      to: "done",
-      action: applyPending,
-    },
-    {
-      event: "graph brush deselect",
-      from: "graph brush in progress",
-      to: "done",
-      /* if current selection is all, cancelPending.  Else, applyPending */
-      action: (fsm, transition, data) =>
-        data.state.graphSelection.selection.mode === "all"
-          ? cancelPending()
-          : applyPending(),
-    },
-    {
-      event: "graph brush end",
-      from: "graph brush in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* graph selection brushing */
+  {
+    event: "graph brush start",
+    from: "init",
+    to: "graph brush in progress",
+    action: stashPending,
+  },
+  {
+    event: "graph brush cancel",
+    from: "graph brush in progress",
+    to: "done",
+    action: applyPending,
+  },
+  {
+    event: "graph brush deselect",
+    from: "graph brush in progress",
+    to: "done",
+    /* if current selection is all, cancelPending.  Else, applyPending */
+    action: (fsm, transition, data) =>
+      data.state.graphSelection.selection.mode === "all"
+        ? cancelPending()
+        : applyPending(),
+  },
+  {
+    event: "graph brush end",
+    from: "graph brush in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* graph selection lasso */
-    {
-      event: "graph lasso start",
-      from: "init",
-      to: "graph lasso in progress",
-      action: stashPending,
-    },
-    {
-      event: "graph lasso cancel",
-      from: "graph lasso in progress",
-      to: "done",
-      action: applyPending,
-    },
-    {
-      event: "graph lasso deselect",
-      from: "graph lasso in progress",
-      to: "done",
-      /* if current selection is all, cancelPending.  Else, applyPending */
-      action: (fsm, transition, data) =>
-        data.state.graphSelection.selection.mode === "all"
-          ? cancelPending()
-          : applyPending(),
-    },
-    {
-      event: "graph lasso end",
-      from: "graph lasso in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* graph selection lasso */
+  {
+    event: "graph lasso start",
+    from: "init",
+    to: "graph lasso in progress",
+    action: stashPending,
+  },
+  {
+    event: "graph lasso cancel",
+    from: "graph lasso in progress",
+    to: "done",
+    action: applyPending,
+  },
+  {
+    event: "graph lasso deselect",
+    from: "graph lasso in progress",
+    to: "done",
+    /* if current selection is all, cancelPending.  Else, applyPending */
+    action: (fsm, transition, data) =>
+      data.state.graphSelection.selection.mode === "all"
+        ? cancelPending()
+        : applyPending(),
+  },
+  {
+    event: "graph lasso end",
+    from: "graph lasso in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* Continuous metadata histogram brush selection */
-    {
-      event: "continuous metadata histogram start",
-      from: "init",
-      to: "continuous histo select in progress",
-      action: stashPending,
-    },
-    {
-      event: "continuous metadata histogram cancel",
-      from: "continuous histo select in progress",
-      to: "done",
-      action: cancelPending,
-    },
-    {
-      event: "continuous metadata histogram cancel",
-      from: "init",
-      to: "done",
-      action: save,
-    },
-    {
-      event: "continuous metadata histogram end",
-      from: "continuous histo select in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* Continuous metadata histogram brush selection */
+  {
+    event: "continuous metadata histogram start",
+    from: "init",
+    to: "continuous histo select in progress",
+    action: stashPending,
+  },
+  {
+    event: "continuous metadata histogram cancel",
+    from: "continuous histo select in progress",
+    to: "done",
+    action: cancelPending,
+  },
+  {
+    event: "continuous metadata histogram cancel",
+    from: "init",
+    to: "done",
+    action: save,
+  },
+  {
+    event: "continuous metadata histogram end",
+    from: "continuous histo select in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* Single gene request by user */
-    {
-      event: "single user defined gene start",
-      from: "init",
-      to: "single user gene request in progress",
-      action: stashPending,
-    },
-    {
-      event: "request user defined gene error",
-      from: "single user gene request in progress",
-      to: "single user gene error in progress",
-      action: skip,
-    },
-    {
-      event: "single user defined gene error",
-      from: "single user gene error in progress",
-      to: "done",
-      action: cancelPending,
-    },
-    {
-      event: "single user defined gene complete",
-      from: "single user gene request in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* Single sample request by user */
+  {
+    event: "single user defined sample start",
+    from: "init",
+    to: "single user sample request in progress",
+    action: stashPending,
+  },
+  {
+    event: "request user defined sample error",
+    from: "single user sample request in progress",
+    to: "single user sample error in progress",
+    action: skip,
+  },
+  {
+    event: "single user defined sample error",
+    from: "single user sample error in progress",
+    to: "done",
+    action: cancelPending,
+  },
+  {
+    event: "single user defined sample complete",
+    from: "single user sample request in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* Bulk gene request by user */
-    {
-      event: "bulk user defined gene start",
-      from: "init",
-      to: "bulk user gene request in progress",
-      action: stashPending,
-    },
-    {
-      event: "request user defined gene error",
-      from: "bulk user gene request in progress",
-      to: "bulk user gene request error in progress",
-      action: skip,
-    },
-    {
-      event: "bulk user defined gene error",
-      from: "bulk user gene request error in progress",
-      to: "done",
-      action: cancelPending,
-    },
-    {
-      event: "bulk user defined gene complete",
-      from: "bulk user gene request in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* Bulk sample request by user */
+  {
+    event: "bulk user defined sample start",
+    from: "init",
+    to: "bulk user sample request in progress",
+    action: stashPending,
+  },
+  {
+    event: "request user defined sample error",
+    from: "bulk user sample request in progress",
+    to: "bulk user sample request error in progress",
+    action: skip,
+  },
+  {
+    event: "bulk user defined sample error",
+    from: "bulk user sample request error in progress",
+    to: "done",
+    action: cancelPending,
+  },
+  {
+    event: "bulk user defined sample complete",
+    from: "bulk user sample request in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* Compute Differential Expression button user action */
-    {
-      event: "request differential expression started",
-      from: "init",
-      to: "diffexp in progress",
-      action: stashPending,
-    },
-    {
-      event: "request user defined gene error",
-      from: "diffexp in progress",
-      to: "done",
-      action: cancelPending,
-    },
-    {
-      event: "request differential expression success",
-      from: "diffexp in progress",
-      to: "done",
-      action: applyPending,
-    },
+  /* Compute Differential Expression button user action */
+  {
+    event: "request differential expression started",
+    from: "init",
+    to: "diffexp in progress",
+    action: stashPending,
+  },
+  {
+    event: "request user defined sample error",
+    from: "diffexp in progress",
+    to: "done",
+    action: cancelPending,
+  },
+  {
+    event: "request differential expression success",
+    from: "diffexp in progress",
+    to: "done",
+    action: applyPending,
+  },
 
-    /* clear scatter plot button (eg, on scatterplot view) */
-    {
-      event: "clear scatterplot",
-      from: "init",
-      to: "done",
-      action: save,
-    },
-  ];
+  /* clear scatter plot button (eg, on scatterplot view) */
+  {
+    event: "clear scatterplot",
+    from: "init",
+    to: "done",
+    action: save,
+  },
+];
 
 export default createFsmTransitions;
diff --git a/client/src/util/centroid.js b/client/src/util/centroid.js
index cb6956ec9..1d2ebc1c2 100644
--- a/client/src/util/centroid.js
+++ b/client/src/util/centroid.js
@@ -48,9 +48,9 @@ const getCoordinatesByLabel = (
   const { isUserAnno, categoryValueIndices, categoryValueCounts } =
     categorySummary;
 
-  // Iterate over all cells
+  // Iterate over all proteins
   for (let i = 0, len = categoryArray.length; i < len; i += 1) {
-    // Fetch the label of the current cell
+    // Fetch the label of the current protein
     const label = categoryArray[i];
 
     // Get the index of the label within the category
@@ -68,7 +68,7 @@ const getCoordinatesByLabel = (
       // Create/fetch the scratchpad value
       let coords = coordsByCategoryLabel.get(label);
       if (coords === undefined) {
-        // Get the number of cells which are in the label
+        // Get the number of proteins which are in the label
         const numInLabel = categoryValueCounts[labelIndex];
         coords = {
           hasFinite: false,
diff --git a/client/src/util/dataframe/dataframe.js b/client/src/util/dataframe/dataframe.js
index 98693bd03..7da9eeba0 100644
--- a/client/src/util/dataframe/dataframe.js
+++ b/client/src/util/dataframe/dataframe.js
@@ -65,7 +65,7 @@ Simple example:
   console.log(df.col('A').asArray(); // outputs: ['a']
 
 Performance tuning is primarily focused on columnar access patterns, which is the
-dominant pattern in cellxgene.
+dominant pattern in proteinxlocation.
 */
 
 /**
diff --git a/client/src/util/nameCreators.js b/client/src/util/nameCreators.js
index 415e30aca..9bace6511 100644
--- a/client/src/util/nameCreators.js
+++ b/client/src/util/nameCreators.js
@@ -1,7 +1,7 @@
 /*
 
 The original motivation for this file is name collision. It's possible
-to have two of the same gene, user defined and diffexpressed, on the client
+to have two of the same sample, user defined and diffexpressed, on the client
 simultaneously, looking at the same data in the cache but with two
 dimensions and two crossfilters. It's also possible that someone could
 have a obsAnnotation named X, but we are using that for layout. So
diff --git a/client/src/util/parseBulkGeneString.js b/client/src/util/parseBulkGeneString.js
index 015c4e889..581c29801 100644
--- a/client/src/util/parseBulkGeneString.js
+++ b/client/src/util/parseBulkGeneString.js
@@ -1,6 +1,6 @@
 /**
  * The function will split string by comma or space, return unique non-empty strings
- * @param geneString - a string of comma delimited genes
+ * @param geneString - a string of comma delimited samples
  * @returns an array
  */
 import pull from "lodash.pull";
diff --git a/client/src/util/stateManager/colorHelpers.js b/client/src/util/stateManager/colorHelpers.js
index 42a203749..6d54f9dd6 100644
--- a/client/src/util/stateManager/colorHelpers.js
+++ b/client/src/util/stateManager/colorHelpers.js
@@ -34,7 +34,7 @@ export function createColorQuery(colorMode, colorByAccessor, schema, genesets) {
         },
       ];
     }
-    case "color by geneset mean expression": {
+    case "color by sampleset mean expression": {
       const varIndex = schema?.annotations?.var?.index;
 
       if (!varIndex) return null;
@@ -80,7 +80,7 @@ create colors scale and RGB array and return as object. Parameters:
 Returns:
   {
     scale: function, mapping label index to color scale
-    rgb: cell label to color mapping
+    rgb: protein label to color mapping
   }
 */
 function _createColorTable(
@@ -108,7 +108,7 @@ function _createColorTable(
       const { min, max } = col.summarize();
       return createColorsByContinuousMetadata(col.asArray(), min, max);
     }
-    case "color by geneset mean expression": {
+    case "color by sampleset mean expression": {
       const col = colorByData.icol(0);
       const { min, max } = col.summarize();
       return createColorsByContinuousMetadata(col.asArray(), min, max);
diff --git a/client/src/util/stateManager/controlsHelpers.js b/client/src/util/stateManager/controlsHelpers.js
index d64de2b56..fb3a98525 100644
--- a/client/src/util/stateManager/controlsHelpers.js
+++ b/client/src/util/stateManager/controlsHelpers.js
@@ -99,7 +99,7 @@ export function pruneVarDataCache(varData, needed) {
 
   The value should be high enough so we are caching the maximum which will
   "typically" be used in the UI (currently: 10 for diffexp, and N for user-
-  specified genes), and low enough to account for memory use (any single
+  specified samples), and low enough to account for memory use (any single
   column size is 4 bytes * numObs, so a column can be multi-megabyte in common
   use cases).
   */
diff --git a/example-dataset/dimred.h5ad b/example-dataset/dimred.h5ad
new file mode 100644
index 000000000..f25334db6
Binary files /dev/null and b/example-dataset/dimred.h5ad differ