:lipstick: Clean up spec names