Rename modifiers like in package validate