named returned entity in map more appropriately. related to #30