diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index bcc0084..9c4fca9 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -384,22 +384,6 @@ static bool init_structDNA(
 		for (int nr = 0; nr < sdna->nr_types; nr++) {
 			sdna->types[nr] = cp;
 
-			/* this is a patch, to change struct names without a conflict with SDNA */
-			/* be careful to use it, in this case for a system-struct (opengl/X) */
-
-			/* struct Screen was already used by X,
-			 * 'bScreen' replaces the old IrisGL 'Screen' struct */
-			if (strcmp("bScreen", cp) == 0) {
-				sdna->types[nr] = cp + 1;
-			}
-			/* Groups renamed to collections in 2.8 */
-			else if (strcmp("Collection", cp) == 0) {
-				sdna->types[nr] = "Group";
-			}
-			else if (strcmp("CollectionObject", cp) == 0) {
-				sdna->types[nr] = "GroupObject";
-			}
-
 			while (*cp) cp++;
 			cp++;
 		}
diff --git a/source/blender/makesdna/intern/dna_softpatch_defs.h b/source/blender/makesdna/intern/dna_softpatch_defs.h
index 6656170..0662430 100644
--- a/source/blender/makesdna/intern/dna_softpatch_defs.h
+++ b/source/blender/makesdna/intern/dna_softpatch_defs.h
@@ -38,13 +38,6 @@
 
 /* No include guard (intentional). */
 
-DNA_STRUCT_RENAME(Lamp, Light)
-DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner)
-DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_dist)
-DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end)
-DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start)
-DNA_STRUCT_RENAME_ELEM(Light, clipend, clip_end)
-DNA_STRUCT_RENAME_ELEM(Light, clipsta, clip_start)
-DNA_STRUCT_RENAME_ELEM(LightProbe, clipend, clip_end)
-DNA_STRUCT_RENAME_ELEM(LightProbe, clipsta, clip_start)
-DNA_STRUCT_RENAME_ELEM(Object, parentinv, parent_inverse_matrix)
+DNA_STRUCT_RENAME(Group, Collection)
+DNA_STRUCT_RENAME(GroupObject, CollectionObject)
+DNA_STRUCT_RENAME(Screen, bScreen)
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 7230b65..43d735d 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -2474,26 +2474,7 @@ static void rna_auto_types(void)
 	PropertyDefRNA *dp;
 
 	for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
-		/* DNA name for Screen is patched in 2.5, we do the reverse here .. */
-		if (ds->dnaname) {
-			if (STREQ(ds->dnaname, "Screen"))
-				ds->dnaname = "bScreen";
-			if (STREQ(ds->dnaname, "Group"))
-				ds->dnaname = "Collection";
-			if (STREQ(ds->dnaname, "GroupObject"))
-				ds->dnaname = "CollectionObject";
-		}
-
 		for (dp = ds->cont.properties.first; dp; dp = dp->next) {
-			if (dp->dnastructname) {
-				if (STREQ(dp->dnastructname, "Screen"))
-					dp->dnastructname = "bScreen";
-				if (STREQ(dp->dnastructname, "Group"))
-					dp->dnastructname = "Collection";
-				if (STREQ(dp->dnastructname, "GroupObject"))
-					dp->dnastructname = "CollectionObject";
-			}
-
 			if (dp->dnatype) {
 				if (dp->prop->type == PROP_POINTER) {
 					PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;