Added NamePrettifier