Use full names for variables

Use full names for variables everywhere for better readability.

No functional change.
Ok for move instead of ms, but only here.