Fix identifier references.
Dont need to generate number.
Fixup specs.