moved entityName into util/, cleaned it up a bit