LPS-37367

The first 3 commits are fixing problem caused by LPS-36001

The first commit is moving from XXXImpl to XXXModelImpl
The second and third are simply just renaming, no logic change.

The last one is fixing something else.