diff --git a/src/Famix-Deprecated/FamixMetaModelClassesNotDeclaredInFameRule.extension.st b/src/Famix-Deprecated/FamixMetaModelClassesNotDeclaredInFameRule.extension.st
new file mode 100644
index 00000000..8f3145e0
--- /dev/null
+++ b/src/Famix-Deprecated/FamixMetaModelClassesNotDeclaredInFameRule.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #FamixMetaModelClassesNotDeclaredInFameRule }
+
+{ #category : #'*Famix-Deprecated' }
+FamixMetaModelClassesNotDeclaredInFameRule >> group [
+	"This metadata on the instance side is important for P12 but should be removed to have only the class side one in P13."
+
+	^ self class group
+]
+
+{ #category : #'*Famix-Deprecated' }
+FamixMetaModelClassesNotDeclaredInFameRule >> name [
+	"This metadata on the instance side is important for P12 but should be removed to have only the class side one in P13."
+
+	^ self class ruleName
+]
diff --git a/src/Famix-Deprecated/FamixMetaModelClassesShouldNotOverrideRule.extension.st b/src/Famix-Deprecated/FamixMetaModelClassesShouldNotOverrideRule.extension.st
new file mode 100644
index 00000000..0e71cf61
--- /dev/null
+++ b/src/Famix-Deprecated/FamixMetaModelClassesShouldNotOverrideRule.extension.st
@@ -0,0 +1,22 @@
+Extension { #name : #FamixMetaModelClassesShouldNotOverrideRule }
+
+{ #category : #'*Famix-Deprecated' }
+FamixMetaModelClassesShouldNotOverrideRule >> group [
+	"This metadata on the instance side is important for P12 but should be removed to have only the class side one in P13."
+
+	^ self class group
+]
+
+{ #category : #'*Famix-Deprecated' }
+FamixMetaModelClassesShouldNotOverrideRule >> name [
+	"This metadata on the instance side is important for P12 but should be removed to have only the class side one in P13."
+
+	^ self class ruleName
+]
+
+{ #category : #'*Famix-Deprecated' }
+FamixMetaModelClassesShouldNotOverrideRule >> rationale [
+	"This metadata on the instance side is important for P12 but should be removed to have only the class side one in P13."
+
+	^ self class rationale
+]
diff --git a/src/Moose-Core/FAMIXMetaModelClassesNotDeclaredInFameRule.class.st b/src/Moose-Core/FAMIXMetaModelClassesNotDeclaredInFameRule.class.st
index b6bbf832..17860976 100644
--- a/src/Moose-Core/FAMIXMetaModelClassesNotDeclaredInFameRule.class.st
+++ b/src/Moose-Core/FAMIXMetaModelClassesNotDeclaredInFameRule.class.st
@@ -11,6 +11,18 @@ Class {
 	#category : #'Moose-Core'
 }
 
+{ #category : #accessing }
+FamixMetaModelClassesNotDeclaredInFameRule class >> group [
+
+	^ 'Famix'
+]
+
+{ #category : #accessing }
+FamixMetaModelClassesNotDeclaredInFameRule class >> ruleName [
+
+	^ 'A metamodel class is not properly Fame-described by a <FMClass:super:> pragma'
+]
+
 { #category : #accessing }
 FamixMetaModelClassesNotDeclaredInFameRule class >> uniqueIdentifierName [
 	^ 'MetaModelClassesNotDeclaredInFame'
@@ -31,24 +43,12 @@ FamixMetaModelClassesNotDeclaredInFameRule >> checkClass: aContext [
 					^ self ] ]
 ]
 
-{ #category : #accessing }
-FamixMetaModelClassesNotDeclaredInFameRule >> group [
-
-	^ 'Famix'
-]
-
 { #category : #accessing }
 FamixMetaModelClassesNotDeclaredInFameRule >> metaModelClasses [
 	"return all classes that have to be checked in this rule"
 	^ metaModelClasses ifNil: [metaModelClasses := MooseEntity withAllSubclasses].
 ]
 
-{ #category : #accessing }
-FamixMetaModelClassesNotDeclaredInFameRule >> name [
-
-	^ 'A metamodel class is not properly Fame-described by a <FMClass:super:> pragma'
-]
-
 { #category : #running }
 FamixMetaModelClassesNotDeclaredInFameRule >> resultClass [
 
diff --git a/src/Moose-Core/FAMIXMetaModelClassesShouldNotOverrideRule.class.st b/src/Moose-Core/FAMIXMetaModelClassesShouldNotOverrideRule.class.st
index 66417c1c..e17562e3 100644
--- a/src/Moose-Core/FAMIXMetaModelClassesShouldNotOverrideRule.class.st
+++ b/src/Moose-Core/FAMIXMetaModelClassesShouldNotOverrideRule.class.st
@@ -7,6 +7,24 @@ Class {
 	#category : #'Moose-Core'
 }
 
+{ #category : #accessing }
+FamixMetaModelClassesShouldNotOverrideRule class >> group [
+
+	^ 'Famix'
+]
+
+{ #category : #accessing }
+FamixMetaModelClassesShouldNotOverrideRule class >> rationale [
+
+	^ 'check if a metamodel class (MooseEntity and all its subclasses) override some methods that it should not override. Those methods are specified by FamixMetaModelClassesShouldNotOverrideRule >> selectorsThatShouldNotBeOverridden'
+]
+
+{ #category : #accessing }
+FamixMetaModelClassesShouldNotOverrideRule class >> ruleName [
+
+	^ 'A metamodel class override a method that it should not override'
+]
+
 { #category : #accessing }
 FamixMetaModelClassesShouldNotOverrideRule class >> uniqueIdentifierName [
 	^ 'MetaModelClassShouldNotOverride'
@@ -28,30 +46,12 @@ FamixMetaModelClassesShouldNotOverrideRule >> checkClass: aContext [
 		].
 ]
 
-{ #category : #accessing }
-FamixMetaModelClassesShouldNotOverrideRule >> group [
-
-	^ 'Famix'
-]
-
 { #category : #accessing }
 FamixMetaModelClassesShouldNotOverrideRule >> metaModelClasses [
 	"return all classes that have to be checked in this rule"
 	^ metaModelClasses ifNil: [metaModelClasses := MooseEntity allSubclasses].
 ]
 
-{ #category : #accessing }
-FamixMetaModelClassesShouldNotOverrideRule >> name [
-
-	^ 'A metamodel class override a method that it should not override'
-]
-
-{ #category : #accessing }
-FamixMetaModelClassesShouldNotOverrideRule >> rationale [
-
-	^ 'check if a metamodel class (MooseEntity and all its subclasses) override some methods that it should not override. Those methods are specified by FamixMetaModelClassesShouldNotOverrideRule >> selectorsThatShouldNotBeOverridden'
-]
-
 { #category : #accessing }
 FamixMetaModelClassesShouldNotOverrideRule >> selectorsThatShouldNotBeOverridden [