Rename property.
Move factory reference to instance builder.