fix entity names to correspond with the current API