More movement cases; correcting naming inconsistencies.