modify typeG and type_preG component names

theories/typing/soundness.v

@@ -8,10 +8,10 @@ From lrust.typing Require Import typing.
 Set Default Proof Using "Type".
 
 Class typePreG Σ := PreTypeG {
-  type_heapG :> lrustPreG Σ;
-  type_lftG :> lftPreG Σ;
+  type_preG_lrustG :> lrustPreG Σ;
+  type_preG_lftG :> lftPreG Σ;
   type_preG_na_invG :> na_invG Σ;
-  type_frac_borrowG :> frac_borG Σ
+  type_preG_frac_borG :> frac_borG Σ
 }.
 
 Definition typeΣ : gFunctors :=

theories/typing/type.v

@@ -7,7 +7,7 @@ From lrust.typing Require Import lft_contexts.
 Set Default Proof Using "Type".
 
 Class typeG Σ := TypeG {
-  type_heapG :> lrustG Σ;
+  type_lrustG :> lrustG Σ;
   type_lftG :> lftG Σ;
   type_na_invG :> na_invG Σ;
   type_frac_borrowG :> frac_borG Σ