LPS-48728 Rename some classes as agreed with Adolfo