Rename attributesFor to generate, and cleanup