diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json
index 6c4f44fd..1cc3b7ad 100644
--- a/config/project-scratch-def.json
+++ b/config/project-scratch-def.json
@@ -1,5 +1,5 @@
 {
-    "orgName": "apex-mock",
+    "orgName": "apex-mocks",
     "edition": "Developer",
     "settings": {
         "lightningExperienceSettings": {
diff --git a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls
index 22c827c5..a51cfcd6 100644
--- a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls
+++ b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls
@@ -720,7 +720,7 @@ private class fflib_ApexMocksTest
 	{
 		// Given
 		fflib_ApexMocks mocks = new fflib_ApexMocks();
-		fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks);
+		fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class);
 
 		// When
 		mockList.add('bob');
@@ -735,7 +735,7 @@ private class fflib_ApexMocksTest
 	{
 		// Given
 		fflib_ApexMocks mocks = new fflib_ApexMocks();
-		fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks);
+		fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class);
 
 		// When
 		mocks.startStubbing();
diff --git a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls b/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls
deleted file mode 100644
index 20ed44f7..00000000
--- a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Generated by apex-mocks-generator version 4.0.1 */
-@isTest
-public class fflib_Mocks
-{
-	public class Mockfflib_MyList implements fflib_MyList.IList
-	{
-		private fflib_ApexMocks mocks;
-
-		public Mockfflib_MyList(fflib_ApexMocks mocks)
-		{
-			this.mocks = mocks;
-		}
-
-		public void add(String value)
-		{
-			mocks.mockVoidMethod(this, 'add', new List<Type> {System.Type.forName('String')}, new List<Object> {value});
-		}
-
-		public void add(String value1, String value2, String value3, String value4)
-		{
-			mocks.mockVoidMethod(this, 'add', new List<Type> {System.Type.forName('String'), System.Type.forName('String'), System.Type.forName('String'), System.Type.forName('String')}, new List<Object> {value1, value2, value3, value4});
-		}
-
-		public void addMore(String value)
-		{
-			mocks.mockVoidMethod(this, 'addMore', new List<Type> {System.Type.forName('String')}, new List<Object> {value});
-		}
-
-		public void add(String[] value)
-		{
-			mocks.mockVoidMethod(this, 'add', new List<Type> {System.Type.forName('String[]')}, new List<Object> {value});
-		}
-
-		public String get(Integer index)
-		{
-			return (String) mocks.mockNonVoidMethod(this, 'get', new List<Type> {System.Type.forName('Integer')}, new List<Object> {index});
-		}
-
-		public String get2(Integer index, String value)
-		{
-			return (String) mocks.mockNonVoidMethod(this, 'get2', new List<Type> {System.Type.forName('Integer'), System.Type.forName('String')}, new List<Object> {index, value});
-		}
-
-		public void clear()
-		{
-			mocks.mockVoidMethod(this, 'clear', new List<Type> {}, new List<Object> {});
-		}
-
-		public Boolean isEmpty()
-		{
-			return (Boolean) mocks.mockNonVoidMethod(this, 'isEmpty', new List<Type> {}, new List<Object> {});
-		}
-
-		public void set(Integer index, Object value)
-		{
-			mocks.mockVoidMethod(this, 'set', new List<Type> {System.Type.forName('Integer'), System.Type.forName('Object')}, new List<Object> {index, value});
-		}
-	}
-
-}
diff --git a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml b/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml
deleted file mode 100644
index 651b1729..00000000
--- a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>61.0</apiVersion>
-    <status>Active</status>
-</ApexClass>