Change variable names
+1 for 4b6b344