Making the names nicer