Fixed naming of things by changing ATTRIBUTE refs to PROPERTY