LPS-49590 Renamed classes to match liferay patterns