diff --git a/theories/proofmode/classes.v b/theories/proofmode/classes.v
index acef2f557eaa54b25e517d41736ef37700d32c74..3ee427127b0725103b33041a4ceb1612236dba11 100644
--- a/theories/proofmode/classes.v
+++ b/theories/proofmode/classes.v
@@ -403,46 +403,51 @@ Class MakeEmbed `{BiEmbedding PROP PROP'} (P : PROP) (Q : PROP') :=
 Arguments MakeEmbed {_ _ _ _} _%I _%I.
 Hint Mode MakeEmbed + + + + - - : typeclass_instances.
 Class KnownMakeEmbed `{BiEmbedding PROP PROP'} (P : PROP) (Q : PROP') :=
-  go_make_embed :> MakeEmbed P Q.
+  known_make_embed :> MakeEmbed P Q.
 Arguments KnownMakeEmbed {_ _ _ _} _%I _%I.
 Hint Mode KnownMakeEmbed + + + + ! - : typeclass_instances.
 
 Class MakeSep {PROP : bi} (P Q PQ : PROP) := make_sep : P ∗ Q ⊣⊢ PQ .
 Arguments MakeSep {_} _%I _%I _%I.
 Hint Mode MakeSep + - - - : typeclass_instances.
-Class KnownLMakeSep {PROP : bi} (P Q PQ : PROP) := gol_make_sep :> MakeSep P Q PQ.
+Class KnownLMakeSep {PROP : bi} (P Q PQ : PROP) :=
+  knownl_make_sep :> MakeSep P Q PQ.
 Arguments KnownLMakeSep {_} _%I _%I _%I.
 Hint Mode KnownLMakeSep + ! - - : typeclass_instances.
-Class KnownRMakeSep {PROP : bi} (P Q PQ : PROP) := gor_make_sep :> MakeSep P Q PQ.
+Class KnownRMakeSep {PROP : bi} (P Q PQ : PROP) :=
+  knownr_make_sep :> MakeSep P Q PQ.
 Arguments KnownRMakeSep {_} _%I _%I _%I.
 Hint Mode KnownRMakeSep + - ! - : typeclass_instances.
 
 Class MakeAnd {PROP : bi} (P Q PQ : PROP) :=  make_and_l : P ∧ Q ⊣⊢ PQ.
 Arguments MakeAnd {_} _%I _%I _%I.
 Hint Mode MakeAnd + - - - : typeclass_instances.
-Class KnownLMakeAnd {PROP : bi} (P Q PQ : PROP) := gol_make_and :> MakeAnd P Q PQ.
+Class KnownLMakeAnd {PROP : bi} (P Q PQ : PROP) :=
+  knownl_make_and :> MakeAnd P Q PQ.
 Arguments KnownLMakeAnd {_} _%I _%I _%I.
 Hint Mode KnownLMakeAnd + ! - - : typeclass_instances.
-Class KnownRMakeAnd {PROP : bi} (P Q PQ : PROP) := gor_make_and :> MakeAnd P Q PQ.
+Class KnownRMakeAnd {PROP : bi} (P Q PQ : PROP) :=
+  knownr_make_and :> MakeAnd P Q PQ.
 Arguments KnownRMakeAnd {_} _%I _%I _%I.
 Hint Mode KnownRMakeAnd + - ! - : typeclass_instances.
 
 Class MakeOr {PROP : bi} (P Q PQ : PROP) := make_or_l : P ∨ Q ⊣⊢ PQ.
 Arguments MakeOr {_} _%I _%I _%I.
 Hint Mode MakeOr + - - - : typeclass_instances.
-Class KnownLMakeOr {PROP : bi} (P Q PQ : PROP) := gol_make_or :> MakeOr P Q PQ.
+Class KnownLMakeOr {PROP : bi} (P Q PQ : PROP) :=
+  knownl_make_or :> MakeOr P Q PQ.
 Arguments KnownLMakeOr {_} _%I _%I _%I.
 Hint Mode KnownLMakeOr + ! - - : typeclass_instances.
-Class KnownRMakeOr {PROP : bi} (P Q PQ : PROP) := gor_make_or :> MakeOr P Q PQ.
+Class KnownRMakeOr {PROP : bi} (P Q PQ : PROP) := knownr_make_or :> MakeOr P Q PQ.
 Arguments KnownRMakeOr {_} _%I _%I _%I.
 Hint Mode KnownRMakeOr + - ! - : typeclass_instances.
 
 Class MakeAffinely {PROP : bi} (P Q : PROP) :=
-  make_affinely :> bi_affinely P ⊣⊢ Q.
+  make_affinely : bi_affinely P ⊣⊢ Q.
 Arguments MakeAffinely {_} _%I _%I.
 Hint Mode MakeAffinely + - - : typeclass_instances.
 Class KnownMakeAffinely {PROP : bi} (P Q : PROP) :=
-  go_make_affinely : MakeAffinely P Q.
+  known_make_affinely :> MakeAffinely P Q.
 Arguments KnownMakeAffinely {_} _%I _%I.
 Hint Mode KnownMakeAffinely + ! - : typeclass_instances.
 
@@ -451,7 +456,7 @@ Class MakeAbsorbingly {PROP : bi} (P Q : PROP) :=
 Arguments MakeAbsorbingly {_} _%I _%I.
 Hint Mode MakeAbsorbingly + - - : typeclass_instances.
 Class KnownMakeAbsorbingly {PROP : bi} (P Q : PROP) :=
-  go_make_absorbingly :> MakeAbsorbingly P Q.
+  known_make_absorbingly :> MakeAbsorbingly P Q.
 Arguments KnownMakeAbsorbingly {_} _%I _%I.
 Hint Mode KnownMakeAbsorbingly + ! - : typeclass_instances.
 
@@ -460,7 +465,7 @@ Class MakePersistently {PROP : bi} (P Q : PROP) :=
 Arguments MakePersistently {_} _%I _%I.
 Hint Mode MakePersistently + - - : typeclass_instances.
 Class KnownMakePersistently {PROP : bi} (P Q : PROP) :=
-  go_make_persistently :> MakePersistently P Q.
+  known_make_persistently :> MakePersistently P Q.
 Arguments KnownMakePersistently {_} _%I _%I.
 Hint Mode KnownMakePersistently + ! - : typeclass_instances.
 
@@ -469,7 +474,7 @@ Class MakeLaterN {PROP : sbi} (n : nat) (P lP : PROP) :=
 Arguments MakeLaterN {_} _%nat _%I _%I.
 Hint Mode MakeLaterN + + - - : typeclass_instances.
 Class KnownMakeLaterN {PROP : sbi} (n : nat) (P lP : PROP) :=
-  go_make_laterN :> MakeLaterN n P lP.
+  known_make_laterN :> MakeLaterN n P lP.
 Arguments KnownMakeLaterN {_} _%nat _%I _%I.
 Hint Mode KnownMakeLaterN + + ! - : typeclass_instances.
 
@@ -478,7 +483,7 @@ Class MakeExcept0 {PROP : sbi} (P Q : PROP) :=
 Arguments MakeExcept0 {_} _%I _%I.
 Hint Mode MakeExcept0 + - - : typeclass_instances.
 Class KnownMakeExcept0 {PROP : sbi} (P Q : PROP) :=
-  go_make_except_0 :> MakeExcept0 P Q.
+  known_make_except_0 :> MakeExcept0 P Q.
 Arguments KnownMakeExcept0 {_} _%I _%I.
 Hint Mode KnownMakeExcept0 + ! - : typeclass_instances.