Renamed MessagePropertyBuilder to MessagePropertySaver and
PropertyBuilder to MessagePropertyBuilder