object_type: use new enumeration names Use the new object_type enumeration names within the codebase.