Make names nicer