type_subtype_pairs

change all occourences of 'entity_type' and 'entity_subtype' to:
'type_subtype_pairs' => array('type' => 'subtype'),