WCM-178 Improve report names and messages