Made NameTags follow coding guidelines