Rationalise messages and terminology used in portal. Fixes #447