diff --git a/moto/dynamodb2/models.py b/moto/dynamodb2/models.py
index 2c6d8d60f..5e7888842 100644
--- a/moto/dynamodb2/models.py
+++ b/moto/dynamodb2/models.py
@@ -118,7 +118,7 @@ class Item(object):
                 # A Real value
                 value = value.lstrip(":").rstrip(",")
                 for k, v in expression_attribute_names.items():
-                    value = value.replace(k, v)
+                    value = re.sub(r'{}\b'.format(k), v, value)
                 if action == "REMOVE":
                     self.attrs.pop(value, None)
                 elif action == 'SET':