LPS-44599 Rename name of classes to match the pattern