squash this commit - added attr_name to models with no :name field