Replaced name formatting with classes