:lipstick: Rename classes to match standard