Motion: adjust enums to naming conventions