Removed the subentity_type field and converted it to a subentity_kind field in the migrations. Performed two schema migrations so that other apps can easily write a data migration