Rename shape constructors