GRNS correcting naming conventions and buttons, etc