Renamed a few attrbitutes to get things working