diff --git a/exercises/secret-handshake/example.py b/exercises/secret-handshake/example.py
index dbfc548cac..f35f291821 100644
--- a/exercises/secret-handshake/example.py
+++ b/exercises/secret-handshake/example.py
@@ -1,10 +1,10 @@
 gestures = ['wink', 'double blink', 'close your eyes', 'jump']
 
 
-def handshake(code):
+def commands(number):
     actions = [gestures[i] for i in range(len(gestures))
-               if (code >> i) % 2 == 1]
-    return actions if code < 16 else list(reversed(actions))
+               if (number >> i) % 2 == 1]
+    return actions if number < 16 else list(reversed(actions))
 
 
 def secret_code(actions):
diff --git a/exercises/secret-handshake/secret_handshake.py b/exercises/secret-handshake/secret_handshake.py
index e5204fe4ae..1d6f9433bd 100644
--- a/exercises/secret-handshake/secret_handshake.py
+++ b/exercises/secret-handshake/secret_handshake.py
@@ -1,4 +1,4 @@
-def handshake(code):
+def commands(number):
     pass
 
 
diff --git a/exercises/secret-handshake/secret_handshake_test.py b/exercises/secret-handshake/secret_handshake_test.py
index 31a3b9ece4..ecc025731f 100644
--- a/exercises/secret-handshake/secret_handshake_test.py
+++ b/exercises/secret-handshake/secret_handshake_test.py
@@ -1,49 +1,49 @@
 import unittest
 
-from secret_handshake import handshake, secret_code
+from secret_handshake import commands, secret_code
 
 
 # Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
 
 class SecretHandshakeTest(unittest.TestCase):
     def test_wink_for_1(self):
-        self.assertEqual(handshake(1), ['wink'])
+        self.assertEqual(commands(1), ['wink'])
 
     def test_double_blink_for_10(self):
-        self.assertEqual(handshake(2), ['double blink'])
+        self.assertEqual(commands(2), ['double blink'])
 
     def test_close_your_eyes_for_100(self):
-        self.assertEqual(handshake(4), ['close your eyes'])
+        self.assertEqual(commands(4), ['close your eyes'])
 
     def test_jump_for_1000(self):
-        self.assertEqual(handshake(8), ['jump'])
+        self.assertEqual(commands(8), ['jump'])
 
     def test_combine_two_actions(self):
-        self.assertEqual(handshake(3), ['wink', 'double blink'])
+        self.assertEqual(commands(3), ['wink', 'double blink'])
 
     def test_reverse_two_actions(self):
-        self.assertEqual(handshake(19), ['double blink', 'wink'])
+        self.assertEqual(commands(19), ['double blink', 'wink'])
 
     def test_reversing_one_action_gives_the_same_action(self):
-        self.assertEqual(handshake(24), ['jump'])
+        self.assertEqual(commands(24), ['jump'])
 
     def test_reversing_no_actions_still_gives_no_actions(self):
-        self.assertEqual(handshake(16), [])
+        self.assertEqual(commands(16), [])
 
     def test_all_possible_actions(self):
-        self.assertEqual(handshake(15), ['wink',
-                                         'double blink',
-                                         'close your eyes',
-                                         'jump'])
+        self.assertEqual(commands(15), ['wink',
+                                        'double blink',
+                                        'close your eyes',
+                                        'jump'])
 
     def test_reverse_all_possible_actions(self):
-        self.assertEqual(handshake(31), ['jump',
-                                         'close your eyes',
-                                         'double blink',
-                                         'wink'])
+        self.assertEqual(commands(31), ['jump',
+                                        'close your eyes',
+                                        'double blink',
+                                        'wink'])
 
     def test_do_nothing_for_zero(self):
-        self.assertEqual(handshake(0), [])
+        self.assertEqual(commands(0), [])
 
     # Track-specific tests
 
@@ -61,20 +61,20 @@ def test_code3(self):
 
     @unittest.skip('extra-credit')
     def test_reversible1(self):
-        self.assertEqual(secret_code(handshake(27)), 27)
+        self.assertEqual(secret_code(commands(27)), 27)
 
     @unittest.skip('extra-credit')
     def test_reversible2(self):
-        self.assertEqual(secret_code(handshake(1)), 1)
+        self.assertEqual(secret_code(commands(1)), 1)
 
     @unittest.skip('extra-credit')
     def test_reversible3(self):
-        self.assertEqual(secret_code(handshake(7)), 7)
+        self.assertEqual(secret_code(commands(7)), 7)
 
     @unittest.skip('extra-credit')
     def test_reversible4(self):
         inp = ['wink', 'double blink', 'jump']
-        self.assertEqual(handshake(secret_code(inp)), inp)
+        self.assertEqual(commands(secret_code(inp)), inp)
 
 
 if __name__ == '__main__':