:lipstick: clean up spec names
Fix id generation
:lipstick: per nathan’s request