[CXF-5954] Renaming some classes