A bit of cleanup (var, template and message names)