diff --git a/src/bonsai/bonsai/bim/data/libraries/IFC4 Demo Library.ifc b/src/bonsai/bonsai/bim/data/libraries/IFC4 Demo Library.ifc
index bd0231ced3..ad708cd2fe 100644
--- a/src/bonsai/bonsai/bim/data/libraries/IFC4 Demo Library.ifc
+++ b/src/bonsai/bonsai/bim/data/libraries/IFC4 Demo Library.ifc
@@ -5,8 +5,8 @@ FILE_NAME('/dev/null','2024-03-03T16:03:58+11:00',(),(),'IfcOpenShell v0.7.0-eaa
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
-#1=IFCPROJECT('3NJUxHyTzEv96oezyDYEqf',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
-#2=IFCPROJECTLIBRARY('0D39k7hbT5ce$jWaCd2niG',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
+#1=IFCPROJECT('3NJUxHyTzEv96oezyDYEqf',$,'Bonsai Demo',$,$,$,$,(#12,#16),#7);
+#2=IFCPROJECTLIBRARY('0D39k7hbT5ce$jWaCd2niG',$,'Bonsai Demo Library',$,$,$,$,$,$);
#3=IFCRELDECLARES('2RWVohyP57PBHT9zCs4H2O',$,$,$,#1,(#2));
#4=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
#5=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
diff --git a/src/bonsai/bonsai/bim/data/templates/projects/IFC4 Demo Template.ifc b/src/bonsai/bonsai/bim/data/templates/projects/IFC4 Demo Template.ifc
index bd0231ced3..ad708cd2fe 100644
--- a/src/bonsai/bonsai/bim/data/templates/projects/IFC4 Demo Template.ifc
+++ b/src/bonsai/bonsai/bim/data/templates/projects/IFC4 Demo Template.ifc
@@ -5,8 +5,8 @@ FILE_NAME('/dev/null','2024-03-03T16:03:58+11:00',(),(),'IfcOpenShell v0.7.0-eaa
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
-#1=IFCPROJECT('3NJUxHyTzEv96oezyDYEqf',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
-#2=IFCPROJECTLIBRARY('0D39k7hbT5ce$jWaCd2niG',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
+#1=IFCPROJECT('3NJUxHyTzEv96oezyDYEqf',$,'Bonsai Demo',$,$,$,$,(#12,#16),#7);
+#2=IFCPROJECTLIBRARY('0D39k7hbT5ce$jWaCd2niG',$,'Bonsai Demo Library',$,$,$,$,$,$);
#3=IFCRELDECLARES('2RWVohyP57PBHT9zCs4H2O',$,$,$,#1,(#2));
#4=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
#5=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
diff --git a/src/bonsai/bonsai/bim/data/templates/titleblocks/A1.svg b/src/bonsai/bonsai/bim/data/templates/titleblocks/A1.svg
index 7907be0d93..4c1f7dad4d 100644
--- a/src/bonsai/bonsai/bim/data/templates/titleblocks/A1.svg
+++ b/src/bonsai/bonsai/bim/data/templates/titleblocks/A1.svg
@@ -24,7 +24,7 @@
/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
+ id="desc89610">/home/dion/Projects/IfcOpenShell/src/bonsai/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
+ id="desc89610">/home/dion/Projects/IfcOpenShell/src/bonsai/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
+ id="desc89610">/home/dion/Projects/IfcOpenShell/src/bonsai/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual
diff --git a/src/bonsai/test/files/annotation.ifc b/src/bonsai/test/files/annotation.ifc
index 7d076c56d9..c3fd0e6712 100644
--- a/src/bonsai/test/files/annotation.ifc
+++ b/src/bonsai/test/files/annotation.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('annotation.ifc','2021-10-19T11:50:01+11:00',(),(),'IfcOpenShell v0.7.0-6cc7d796','BlenderBIM 0.0.999999','Nobody');
+FILE_NAME('annotation.ifc','2021-10-19T11:50:01+11:00',(),(),'IfcOpenShell v0.7.0-6cc7d796','Bonsai 0.0.999999','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
@@ -11,7 +11,7 @@ DATA;
#4=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
#5=IFCTELECOMADDRESS(.USERDEFINED.,$,'WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
#6=IFCORGANIZATION('IfcOpenShell','IfcOpenShell','IfcOpenShell is an open source software library that helps users and software developers to work with IFC data.',(#4),(#5));
-#7=IFCAPPLICATION(#6,'0.0.999999','BlenderBIM Add-on','BlenderBIM');
+#7=IFCAPPLICATION(#6,'0.0.999999','Bonsai','Bonsai');
#8=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1634604558,#3,#7,1634604558);
#9=IFCPROJECT('0NqkoFmWPBxvsDLeGa5rDc',#8,'My Project',$,$,$,$,(#18,#24),#13);
#10=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
diff --git a/src/bonsai/test/files/basic.ifc b/src/bonsai/test/files/basic.ifc
index c321640833..d613dcee46 100644
--- a/src/bonsai/test/files/basic.ifc
+++ b/src/bonsai/test/files/basic.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('basic.ifc','2021-10-16T11:16:34+11:00',(),(),'IfcOpenShell v0.7.0-6cc7d796','BlenderBIM 0.0.999999','Nobody');
+FILE_NAME('basic.ifc','2021-10-16T11:16:34+11:00',(),(),'IfcOpenShell v0.7.0-6cc7d796','Bonsai 0.0.999999','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
@@ -9,10 +9,10 @@ DATA;
#2=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
#3=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
#4=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
-#5=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://bonsaibim.org',$);
+#5=IFCTELECOMADDRESS(.USERDEFINED.,'Bonsai webpage of the software collection.','WEBPAGE',$,$,$,$,'https://bonsaibim.org',$);
#6=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
#7=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#3),(#4,#5,#6));
-#8=IFCAPPLICATION(#7,'0.0.999999','BlenderBIM Add-on','BlenderBIM');
+#8=IFCAPPLICATION(#7,'0.0.999999','Bonsai','Bonsai');
#9=IFCPERSONANDORGANIZATION(#1,#2,$);
#10=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1631353388,#9,#8,1631353388);
#11=IFCPROJECT('2xwg5dkcT4T8MlEIX1jLjD',#10,'My Project',$,$,$,$,(#20,#27),#15);
diff --git a/src/bonsai/test/files/decomposition.ifc b/src/bonsai/test/files/decomposition.ifc
index dac82da421..b225a80f13 100644
--- a/src/bonsai/test/files/decomposition.ifc
+++ b/src/bonsai/test/files/decomposition.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('decomposition.ifc','2021-09-21T09:50:31+10:00',(),(),'IfcOpenShell 0.6.0b0','BlenderBIM 0.0.999999','Nobody');
+FILE_NAME('decomposition.ifc','2021-09-21T09:50:31+10:00',(),(),'IfcOpenShell 0.6.0b0','Bonsai 0.0.999999','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
@@ -9,10 +9,10 @@ DATA;
#2=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
#3=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
#4=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
-#5=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://bonsaibim.org',$);
+#5=IFCTELECOMADDRESS(.USERDEFINED.,'Bonsai webpage of the software collection.','WEBPAGE',$,$,$,$,'https://bonsaibim.org',$);
#6=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
#7=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#3),(#4,#5,#6));
-#8=IFCAPPLICATION(#7,'0.0.999999','BlenderBIM Add-on','BlenderBIM');
+#8=IFCAPPLICATION(#7,'0.0.999999','Bonsai','Bonsai');
#9=IFCPERSONANDORGANIZATION(#1,#2,$);
#10=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632181704,#9,#8,1632181704);
#11=IFCPROJECT('25mhbqrQzBIhdUUHrZK_q3',#10,'My Project',$,$,$,$,(#20,#27),#15);
diff --git a/src/bonsai/test/files/geolocation-mapconversion-angle.ifc b/src/bonsai/test/files/geolocation-mapconversion-angle.ifc
index 98de6466c0..f9a2cf4a23 100644
--- a/src/bonsai/test/files/geolocation-mapconversion-angle.ifc
+++ b/src/bonsai/test/files/geolocation-mapconversion-angle.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('geolocation-mapconversion-angle.ifc','2024-07-07T22:26:16+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-9d11f8a','Nobody');
+FILE_NAME('geolocation-mapconversion-angle.ifc','2024-07-07T22:26:16+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-9d11f8a','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-mapconversion-offsetsite.ifc b/src/bonsai/test/files/geolocation-mapconversion-offsetsite.ifc
index 0c5e489dfa..231dc5cf89 100644
--- a/src/bonsai/test/files/geolocation-mapconversion-offsetsite.ifc
+++ b/src/bonsai/test/files/geolocation-mapconversion-offsetsite.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('geomap.ifc','2024-06-16T15:47:44+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-99f329c','Nobody');
+FILE_NAME('geomap.ifc','2024-06-16T15:47:44+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-99f329c','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-mapconversion.ifc b/src/bonsai/test/files/geolocation-mapconversion.ifc
index dc9d93b7b3..c4417abd63 100644
--- a/src/bonsai/test/files/geolocation-mapconversion.ifc
+++ b/src/bonsai/test/files/geolocation-mapconversion.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('geomap.ifc','2024-06-16T15:47:44+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-99f329c','Nobody');
+FILE_NAME('geomap.ifc','2024-06-16T15:47:44+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-99f329c','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-offsetsite.ifc b/src/bonsai/test/files/geolocation-offsetsite.ifc
index 2e622a2b54..6e1a448535 100644
--- a/src/bonsai/test/files/geolocation-offsetsite.ifc
+++ b/src/bonsai/test/files/geolocation-offsetsite.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('geo.ifc','2024-06-05T22:47:24+10:00',(),(),'IfcOpenShell v0.7.0-f7c03db75','BlenderBIM 0.0.999999-8b69ea4','Nobody');
+FILE_NAME('geo.ifc','2024-06-05T22:47:24+10:00',(),(),'IfcOpenShell v0.7.0-f7c03db75','Bonsai 0.0.999999-8b69ea4','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-unit1.ifc b/src/bonsai/test/files/geolocation-unit1.ifc
index b4540ac2b0..c5644ac4f9 100644
--- a/src/bonsai/test/files/geolocation-unit1.ifc
+++ b/src/bonsai/test/files/geolocation-unit1.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('r.ifc','2024-07-12T22:17:19+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-c79e490','Nobody');
+FILE_NAME('r.ifc','2024-07-12T22:17:19+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-c79e490','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-unit2.ifc b/src/bonsai/test/files/geolocation-unit2.ifc
index ed02757d58..d7d301979d 100644
--- a/src/bonsai/test/files/geolocation-unit2.ifc
+++ b/src/bonsai/test/files/geolocation-unit2.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('r2.ifc','2024-07-12T22:36:11+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-c79e490','Nobody');
+FILE_NAME('r2.ifc','2024-07-12T22:36:11+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-c79e490','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation-unit3.ifc b/src/bonsai/test/files/geolocation-unit3.ifc
index d7243abfb4..972d2fc540 100644
--- a/src/bonsai/test/files/geolocation-unit3.ifc
+++ b/src/bonsai/test/files/geolocation-unit3.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('r2.ifc','2024-07-12T22:36:11+10:00',(),(),'IfcOpenShell 0.0.0','BlenderBIM 0.0.0-c79e490','Nobody');
+FILE_NAME('r2.ifc','2024-07-12T22:36:11+10:00',(),(),'IfcOpenShell 0.0.0','Bonsai 0.0.0-c79e490','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/geolocation.ifc b/src/bonsai/test/files/geolocation.ifc
index af1e7238ec..49e49a0f81 100644
--- a/src/bonsai/test/files/geolocation.ifc
+++ b/src/bonsai/test/files/geolocation.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('geo.ifc','2024-06-05T22:47:24+10:00',(),(),'IfcOpenShell v0.7.0-f7c03db75','BlenderBIM 0.0.999999-8b69ea4','Nobody');
+FILE_NAME('geo.ifc','2024-06-05T22:47:24+10:00',(),(),'IfcOpenShell v0.7.0-f7c03db75','Bonsai 0.0.999999-8b69ea4','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
diff --git a/src/bonsai/test/files/linked-aggregates.ifc b/src/bonsai/test/files/linked-aggregates.ifc
index 41c28dd2c1..f06fb61f26 100644
--- a/src/bonsai/test/files/linked-aggregates.ifc
+++ b/src/bonsai/test/files/linked-aggregates.ifc
@@ -1,7 +1,7 @@
ISO-10303-21;
HEADER;
FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('linked-aggregates.ifc','2023-12-18T18:41:41-03:00',(),(),'IfcOpenShell v0.7.0-9cc1f5f0e','BlenderBIM 0.0.230912-fd0450b','Nobody');
+FILE_NAME('linked-aggregates.ifc','2023-12-18T18:41:41-03:00',(),(),'IfcOpenShell v0.7.0-9cc1f5f0e','Bonsai 0.0.230912-fd0450b','Nobody');
FILE_SCHEMA(('IFC4'));
ENDSEC;
DATA;
@@ -1151,14 +1151,14 @@ DATA;
#1230=IFCPRODUCTDEFINITIONSHAPE($,$,(#1302,#1319));
#1246=IFCPROPERTYSET('2Tu$MYW3P1TBBc43ffoRi_',$,'EPset_Parametric',$,(#1248));
#1247=IFCRELDEFINESBYPROPERTIES('2hAhcaDLj0F9gCnfJAmLlK',$,$,$,(#1222),#1246);
-#1248=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('BlenderBIM.DumbLayer2'),$);
+#1248=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('Bonsai.DumbLayer2'),$);
#1249=IFCWALL('3rSTXfFcn4u9mBNbgk9MSB',$,'Wall_01',$,$,#1341,#1255,$,$);
#1250=IFCMATERIALLAYERSETUSAGE(#74,.AXIS2.,.POSITIVE.,0.,$);
#1251=IFCRELASSOCIATESMATERIAL('2l$04b$nXEux0KWqMJPg6c',$,$,$,(#1249),#1250);
#1255=IFCPRODUCTDEFINITIONSHAPE($,$,(#1277,#1294));
#1271=IFCPROPERTYSET('2_ccgyBVv31Rbk8e0gjsdb',$,'EPset_Parametric',$,(#1273));
#1272=IFCRELDEFINESBYPROPERTIES('10j1y8fbb4welJJcuVWQJM',$,$,$,(#1249),#1271);
-#1273=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('BlenderBIM.DumbLayer2'),$);
+#1273=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('Bonsai.DumbLayer2'),$);
#1274=IFCRELCONNECTSPATHELEMENTS('0vDxCGayX2zfucYRconjsZ',$,$,'MITRE',$,#1249,#1222,(),(),.ATSTART.,.ATSTART.);
#1275=IFCCARTESIANPOINTLIST2D(((99.9999923706055,-1.19209271360887E-05),(1100.,-0.000131130203953944)));
#1276=IFCINDEXEDPOLYCURVE(#1275,$,.F.);