Name should now be a lot prettier