made ModifierType names more concise