Styling and renaming fixes