diff --git a/src/test/propertywatchgentest.cpp b/src/test/propertywatchgentest.cpp
index afd9dbc..5973f92 100644
--- a/src/test/propertywatchgentest.cpp
+++ b/src/test/propertywatchgentest.cpp
@@ -62,7 +62,7 @@
 
 TEST(PropertyWatchGenTest, IndiciesSameSize)
 {
-    ASSERT_EQ(sizeof(expectedIndicies), sizeof(indicies));
+    ASSERT_EQ(sizeof(expectedIndicies), sizeof(indices));
 }
 
 TEST(PropertyWatchGenTest, WatchesSameSize)
@@ -85,7 +85,7 @@
     size_t i;
     for (i = 0; i < expectedIndicies.size(); ++i)
     {
-        ASSERT_EQ(indicies[i],
+        ASSERT_EQ(indices[i],
                   expectedIndicies[i]);
     }
 }
diff --git a/src/test/templates/callbackgentest.mako.hpp b/src/test/templates/callbackgentest.mako.hpp
index f387c23..44a02a4 100644
--- a/src/test/templates/callbackgentest.mako.hpp
+++ b/src/test/templates/callbackgentest.mako.hpp
@@ -1,6 +1,6 @@
 auto storageCount = ${len(instances)};
 
-const std::array<Index, ${len(instancegroups)}> indicies = {{
+const std::array<Index, ${len(instancegroups)}> indices = {{
 % for g in instancegroups:
     {
     % for i in g.members:
diff --git a/src/test/templates/propertywatchgentest.mako.hpp b/src/test/templates/propertywatchgentest.mako.hpp
index ac4dbee..4fe3be8 100644
--- a/src/test/templates/propertywatchgentest.mako.hpp
+++ b/src/test/templates/propertywatchgentest.mako.hpp
@@ -1,6 +1,6 @@
 auto storageCount = ${len(instances)};
 
-const std::array<Index, ${len(instancegroups)}> indicies = {{
+const std::array<Index, ${len(instancegroups)}> indices = {{
 % for g in instancegroups:
     {
     % for i in g.members:
diff --git a/src/test/yaml/callbackgentest/one.yaml b/src/test/yaml/callbackgentest/one.yaml
index fa2b814..abd1602 100644
--- a/src/test/yaml/callbackgentest/one.yaml
+++ b/src/test/yaml/callbackgentest/one.yaml
@@ -1,7 +1,7 @@
 # Validate two callbacks that share an index
 # and a single callback with its own index.
 #
-# Expecting three callbacks pointing at two indicies.
+# Expecting three callbacks pointing at two indices.
 
 - name: test path group 1
   class: group
diff --git a/src/test/yaml/callbackgentest/two.yaml b/src/test/yaml/callbackgentest/two.yaml
index 1f61e3b..f7f1d8f 100644
--- a/src/test/yaml/callbackgentest/two.yaml
+++ b/src/test/yaml/callbackgentest/two.yaml
@@ -1,4 +1,4 @@
-# Validate the same callback name works in differnt config files.
+# Validate the same callback name works in different config files.
 
 - name: test path group 1
   class: group