Gussy up the names a bit