Replace acceleration movement types with a generic "movement" type