Update modifiers rename and increment implementations