Change modifiers' naming