diff --git a/v4/main.py b/v4/main.py
index 611fa9e..1171e36 100644
--- a/v4/main.py
+++ b/v4/main.py
@@ -4,14 +4,14 @@ from memory_test import *
 #from shell import *
 #import sys
 
-print(memory_test_shouldDeselectMismatchedItems())
-print(memory_test_shouldDeselectMismatchedItems_itemTwice())
-print(memory_test_shouldDetectVictory())
-print(memory_test_shouldGenerateConstPlayfield())
-print(memory_test_shouldHideMatchingItems())
-print(memory_test_shouldSelectItem_1x())
-print(memory_test_shouldSelectItem_2x())
-print(memory_test_shouldSelectItem_3x())
+print(memory_test_deselectMismatchedItems())
+print(memory_test_deselectMismatchedItems_itemTwice())
+print(memory_test_detectVictory())
+print(memory_test_generateConstPlayfield())
+print(memory_test_hideMatchingItems())
+print(memory_test_selectItem_1x())
+print(memory_test_selectItem_2x())
+print(memory_test_selectItem_3x())
 
 #print(cli_test_greetUser())
 #print(cli_test_selectItem())
diff --git a/v4/memory.py b/v4/memory.py
index d9b7bd9..d33aa28 100644
--- a/v4/memory.py
+++ b/v4/memory.py
@@ -8,7 +8,7 @@ from llm import *
 # 1. The same item has been selected twice
 # 2. Selected items are of different groups
 @llm_by_value
-def memory_shouldDeselectMismatchedItems(
+def memory_deselectMismatchedItems(
   c: memory_Context
 ) -> memory_Context:
   if not (
@@ -44,7 +44,7 @@ def memory_shouldDeselectMismatchedItems(
 # Conditions:
 # 1. Matching items have just been hidden and all items are hidden now
 @llm_by_value
-def memory_shouldDetectVictory(
+def memory_detectVictory(
   c: memory_Context
 ) -> memory_Context:
   if (
@@ -66,7 +66,7 @@ def memory_shouldDetectVictory(
 #
 # Both ids and group ids start with 0
 @llm_by_value
-def memory_shouldGenerateConstPlayfield(
+def memory_generateConstPlayfield(
   c: memory_Context
 ) -> memory_Context:
   if not (
@@ -94,7 +94,7 @@ def memory_shouldGenerateConstPlayfield(
 # Conditions:
 # 1. Two items are selected and they are of the same group
 @llm_by_value
-def memory_shouldHideMatchingItems(
+def memory_hideMatchingItems(
   c: memory_Context
 ) -> memory_Context:
   if (
@@ -116,7 +116,7 @@ def memory_shouldHideMatchingItems(
 # Conditions:
 # 1. Id has just been specified for selection
 @llm_by_value
-def memory_shouldSelectItem(
+def memory_selectItem(
   c: memory_Context
 ) -> memory_Context:
   if not (
diff --git a/v4/memory_test.py b/v4/memory_test.py
index 2704683..08e5362 100644
--- a/v4/memory_test.py
+++ b/v4/memory_test.py
@@ -1,23 +1,23 @@
 from memory import *
 from memory_Context import *
 
-def memory_test_shouldDeselectMismatchedItems(
+def memory_test_deselectMismatchedItems(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select two items of different groups.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 2
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # Detect mismatching.
-  c = memory_shouldDeselectMismatchedItems(c)
+  c = memory_deselectMismatchedItems(c)
 
   # See if the two selected items do not match.
   if (
@@ -26,28 +26,28 @@ def memory_test_shouldDeselectMismatchedItems(
     c.mismatchedItems[0] == 0 and
     c.mismatchedItems[1] == 2
   ):
-    return "OK: memory_shouldDeselectMismatchedItems"
+    return "OK: memory_deselectMismatchedItems"
   #}
-  return "ERR: memory_shouldDeselectMismatchedItems"
+  return "ERR: memory_deselectMismatchedItems"
 #}
 
-def memory_test_shouldDeselectMismatchedItems_itemTwice(
+def memory_test_deselectMismatchedItems_itemTwice(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select the same item twice.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # Detect mismatching.
-  c = memory_shouldDeselectMismatchedItems(c)
+  c = memory_deselectMismatchedItems(c)
 
   # See if the two selected items do not match.
   if (
@@ -55,59 +55,59 @@ def memory_test_shouldDeselectMismatchedItems_itemTwice(
     len(c.mismatchedItems) == 1 and
     c.mismatchedItems[0] == 0
   ):
-    return "OK: memory_shouldDeselectMismatchedItems_itemTwice"
+    return "OK: memory_deselectMismatchedItems_itemTwice"
   #}
-  return "ERR: memory_shouldDeselectMismatchedItems_itemTwice"
+  return "ERR: memory_deselectMismatchedItems_itemTwice"
 #}
 
-def memory_test_shouldDetectVictory(
+def memory_test_detectVictory(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select the first two items of the same group.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 1
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # Hide the first pair.
-  c = memory_shouldHideMatchingItems(c)
+  c = memory_hideMatchingItems(c)
 
   # Select the last two items of the same group.
   c.selectedId = 2
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 3
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # Hide the second pair.
-  c = memory_shouldHideMatchingItems(c)
+  c = memory_hideMatchingItems(c)
 
   # Detect victory.
-  c = memory_shouldDetectVictory(c)
+  c = memory_detectVictory(c)
 
   # See if victory has been detected.
   if (
     c.recentField == "victory" and
     c.victory == True
   ):
-    return "OK: memory_shouldDetectVictory"
+    return "OK: memory_detectVictory"
   #}
-  return "ERR: memory_shouldDetectVictory"
+  return "ERR: memory_detectVictory"
 #}
 
-def memory_test_shouldGenerateConstPlayfield(
+def memory_test_generateConstPlayfield(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
   if (
     c.recentField == "playfieldItems" and
     len(c.playfieldItems) == 4 and
@@ -116,28 +116,28 @@ def memory_test_shouldGenerateConstPlayfield(
     c.playfieldItems[2] == 1 and
     c.playfieldItems[3] == 1
   ):
-    return "OK: memory_shouldGenerateConstPlayfield"
+    return "OK: memory_generateConstPlayfield"
   #}
-  return "ERR: memory_shouldGenerateConstPlayfield"
+  return "ERR: memory_generateConstPlayfield"
 #}
 
-def memory_test_shouldHideMatchingItems(
+def memory_test_hideMatchingItems(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select two items of the same group.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 1
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # Hide matching items.
-  c = memory_shouldHideMatchingItems(c)
+  c = memory_hideMatchingItems(c)
 
   # See if the two selected items match.
   if (
@@ -146,22 +146,22 @@ def memory_test_shouldHideMatchingItems(
     c.hiddenItems[0] == 0 and
     c.hiddenItems[1] == 1
   ):
-    return "OK: memory_shouldHideMatchingItems"
+    return "OK: memory_hideMatchingItems"
   #}
-  return "ERR: memory_shouldHideMatchingItems"
+  return "ERR: memory_hideMatchingItems"
 #}
 
-def memory_test_shouldSelectItem_1x(
+def memory_test_selectItem_1x(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select the first item.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # See if it's in selectedItems now.
   if (
@@ -169,25 +169,25 @@ def memory_test_shouldSelectItem_1x(
     len(c.selectedItems) == 1 and
     c.selectedItems[0] == 0
   ):
-    return "OK: memory_shouldSelectItem_1x"
+    return "OK: memory_selectItem_1x"
   #}
-  return "ERR: memory_shouldSelectItem_1x"
+  return "ERR: memory_selectItem_1x"
 #}
 
-def memory_test_shouldSelectItem_2x(
+def memory_test_selectItem_2x(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select the first two items.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 1
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # See if both items are selected now.
   if (
@@ -196,28 +196,28 @@ def memory_test_shouldSelectItem_2x(
     c.selectedItems[0] == 0 and
     c.selectedItems[1] == 1
   ):
-    return "OK: memory_shouldSelectItem_2x"
+    return "OK: memory_selectItem_2x"
   #}
-  return "ERR: memory_shouldSelectItem_2x"
+  return "ERR: memory_selectItem_2x"
 #}
 
-def memory_test_shouldSelectItem_3x(
+def memory_test_selectItem_3x(
 ) -> str:
   c = memory_createContext()
   c.playfieldSize = 2
   c.recentField = "playfieldSize"
-  c = memory_shouldGenerateConstPlayfield(c)
+  c = memory_generateConstPlayfield(c)
 
   # Select three items.
   c.selectedId = 0
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 1
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
   c.selectedId = 2
   c.recentField = "selectedId"
-  c = memory_shouldSelectItem(c)
+  c = memory_selectItem(c)
 
   # See if only one (last) item is selected now.
   if (
@@ -225,7 +225,7 @@ def memory_test_shouldSelectItem_3x(
     len(c.selectedItems) == 1 and
     c.selectedItems[0] == 2
   ):
-    return "OK: memory_shouldSelectItem_3x"
+    return "OK: memory_selectItem_3x"
   #}
-  return "ERR: memory_shouldSelectItem_3x"
+  return "ERR: memory_selectItem_3x"
 #}