adds generator spec and simplifies naming