Changed name of Shape class