Explicit variable names for movement (ref #2)