Resolved a small problem with and integration test (that had not appeared before?) and always set the entity name on the resource if it has been returned from the command.