renamed shapes to a standard