Fixed error messages around names; use underscores instead of concating.