(Refactoring) Error template names have changed and related localisation message titles too