Rename constructors and selectors