Renaming some styles for consistency