Issue #2165155 by Berdir, tim.plunkett: Change $entity_type to $entity_type_id and $entity_info to $entity_type/$entity_types.
