Canonically renamed variables, reordered verlet steps