Finish renaming constructors