Fixe typo and cleanup references to attributeName