Better handling of names around the app