Nicer name logic