LPS-49307 simplify the classname