Renamed mains, made Shape and Attribute interchangable