Minor cleanup of constructor names.
Initial version.
Initial version.