LPS-35598 Rename modelName and className

cc @mhan810