diff --git a/Rakefile b/Rakefile
index e5e690575..0b2a9f9a5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -287,7 +287,7 @@ task :regress do
   ENV["VERSIONS"] = "all"
   Rake::Task["gen:html_manual"].invoke
   Rake::Task["gen:html"].invoke("generic_rv64")
-  Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel100.pdf"].invoke
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
   Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
   Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
   Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
diff --git a/arch/certificate_class/MockCertificateClass.yaml b/arch/certificate_class/MockCertificateClass.yaml
index 3108005ba..eebbbbbac 100644
--- a/arch/certificate_class/MockCertificateClass.yaml
+++ b/arch/certificate_class/MockCertificateClass.yaml
@@ -10,6 +10,7 @@ introduction: |
 
 naming_scheme: |
   Here's the Mock Certificate Class naming scheme.
+  A Mock certificate class or model can have any name as long as it can be a hash key.
 
 mandatory_priv_modes:
 - M
diff --git a/arch/certificate_model/MC100.yaml b/arch/certificate_model/MC100.yaml
index 0ae2cf783..a182de120 100644
--- a/arch/certificate_model/MC100.yaml
+++ b/arch/certificate_model/MC100.yaml
@@ -6,7 +6,6 @@ name: MC100
 long_name: Basic Microcontroller Certificate
 class:
   $ref: certificate_class/MC.yaml#
-model: 100
 
 # Semantic versions within the model
 versions: 
diff --git a/arch/certificate_model/MockCertificateModel100.yaml b/arch/certificate_model/MockCertificateModel.yaml
similarity index 99%
rename from arch/certificate_model/MockCertificateModel100.yaml
rename to arch/certificate_model/MockCertificateModel.yaml
index 6b65b5cd9..2f19b00b5 100644
--- a/arch/certificate_model/MockCertificateModel100.yaml
+++ b/arch/certificate_model/MockCertificateModel.yaml
@@ -2,11 +2,10 @@
 
 $schema: cert_model_schema.json#
 kind: certificate model
-name: MockCertificateModel100
+name: MockCertificateModel
 long_name: Mock Certificate Model Long Name
 class:
   $ref: certificate_class/MockCertificateClass.yaml#
-model: 100
 
   # XLEN used by rakefile
 base: 64
diff --git a/schemas/cert_model_schema.json b/schemas/cert_model_schema.json
index e11db7d0d..b20551445 100644
--- a/schemas/cert_model_schema.json
+++ b/schemas/cert_model_schema.json
@@ -15,7 +15,7 @@
     },
     "name": {
       "type": "string",
-      "pattern": "^[A-Z][a-zA-Z_]*[0-9]+$",
+      "pattern": "^[A-Z][a-zA-Z0-9_]*$",
       "description": "The short name of the model, used as a database key"
     },
     "long_name": {
@@ -32,11 +32,6 @@
       },
       "description": "Reference to the class this model belongs to"
     },
-    "model": {
-      "type": "integer",
-      "minimum": 0,
-      "description": "Model number"
-    },
     "versions": {
       "type": "array",
       "items": {