Renamed and tested for liferay 6.2 support