diff --git a/src/bonsai/bonsai/core/aggregate.py b/src/bonsai/bonsai/core/aggregate.py
index 89e80fe82f..073c50b6ed 100644
--- a/src/bonsai/bonsai/core/aggregate.py
+++ b/src/bonsai/bonsai/core/aggregate.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Union
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def enable_editing_aggregate(aggregator: tool.Aggregate, obj: bpy.types.Object) -> None:
diff --git a/src/bonsai/bonsai/core/bsdd.py b/src/bonsai/bonsai/core/bsdd.py
index b46d08724f..7091beaf17 100644
--- a/src/bonsai/bonsai/core/bsdd.py
+++ b/src/bonsai/bonsai/core/bsdd.py
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
     import bpy
     import ifcopenshell
     import bsdd
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def get_class_properties(client: bsdd.Client, bsdd: tool.Bsdd) -> dict[str, dict[str, Any]]:
diff --git a/src/bonsai/bonsai/core/cost.py b/src/bonsai/bonsai/core/cost.py
index f67c940d81..30240792a1 100644
--- a/src/bonsai/bonsai/core/cost.py
+++ b/src/bonsai/bonsai/core/cost.py
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
     import bpy
     import ifcopenshell
     import ifcopenshell.util.cost
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_cost_schedule(ifc: tool.Ifc, name: str, predefined_type: str) -> None:
diff --git a/src/bonsai/bonsai/core/covering.py b/src/bonsai/bonsai/core/covering.py
index 6a4b734790..3e7ffd525c 100644
--- a/src/bonsai/bonsai/core/covering.py
+++ b/src/bonsai/bonsai/core/covering.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_instance_flooring_covering_from_cursor(ifc: tool.Ifc, root: tool.Root, spatial: tool.Spatial) -> None:
diff --git a/src/bonsai/bonsai/core/drawing.py b/src/bonsai/bonsai/core/drawing.py
index 1a3cc00ad4..4afb45c4e9 100644
--- a/src/bonsai/bonsai/core/drawing.py
+++ b/src/bonsai/bonsai/core/drawing.py
@@ -24,7 +24,7 @@ if TYPE_CHECKING:
     import bpy
     import ifcopenshell
     import ifcopenshell.util.representation
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def enable_editing_text(drawing: tool.Drawing, obj: bpy.types.Object) -> None:
diff --git a/src/bonsai/bonsai/core/geometry.py b/src/bonsai/bonsai/core/geometry.py
index f81d8eb705..9b158b399f 100644
--- a/src/bonsai/bonsai/core/geometry.py
+++ b/src/bonsai/bonsai/core/geometry.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Sequence
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def edit_object_placement(
diff --git a/src/bonsai/bonsai/core/georeference.py b/src/bonsai/bonsai/core/georeference.py
index b0bf5572c6..4abbe4658d 100644
--- a/src/bonsai/bonsai/core/georeference.py
+++ b/src/bonsai/bonsai/core/georeference.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_georeferencing(georeference: tool.Georeference) -> None:
diff --git a/src/bonsai/bonsai/core/material.py b/src/bonsai/bonsai/core/material.py
index 0ee6fde542..7c5523bd1e 100644
--- a/src/bonsai/bonsai/core/material.py
+++ b/src/bonsai/bonsai/core/material.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Union
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_material(
diff --git a/src/bonsai/bonsai/core/model.py b/src/bonsai/bonsai/core/model.py
index c06b077cc5..af1ead4e1e 100644
--- a/src/bonsai/bonsai/core/model.py
+++ b/src/bonsai/bonsai/core/model.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.tool as tool
+import bonsai.core.tool as tool
 from typing import Literal
 
 
diff --git a/src/bonsai/bonsai/core/owner.py b/src/bonsai/bonsai/core/owner.py
index 93e6416f2b..13222a60b9 100644
--- a/src/bonsai/bonsai/core/owner.py
+++ b/src/bonsai/bonsai/core/owner.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Union
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
     from ifcopenshell.api.owner.add_address import ADDRESS_TYPE
     from ifcopenshell.api.owner.add_actor import ACTOR_TYPE
 
diff --git a/src/bonsai/bonsai/core/patch.py b/src/bonsai/bonsai/core/patch.py
index 4a7b477c58..0a7a83d632 100644
--- a/src/bonsai/bonsai/core/patch.py
+++ b/src/bonsai/bonsai/core/patch.py
@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def run_migrate_patch(patch: tool.Patch, infile: str, outfile: str, schema: str) -> None:
diff --git a/src/bonsai/bonsai/core/profile.py b/src/bonsai/bonsai/core/profile.py
index ad30ccbd9f..d8cf537345 100644
--- a/src/bonsai/bonsai/core/profile.py
+++ b/src/bonsai/bonsai/core/profile.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def purge_unused_profiles(ifc: tool.Ifc, profile: tool.Profile) -> int:
diff --git a/src/bonsai/bonsai/core/project.py b/src/bonsai/bonsai/core/project.py
index 3042d9d3e5..cf09008ef2 100644
--- a/src/bonsai/bonsai/core/project.py
+++ b/src/bonsai/bonsai/core/project.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def create_project(
diff --git a/src/bonsai/bonsai/core/pset.py b/src/bonsai/bonsai/core/pset.py
index 9da83d73a4..c3ffd65046 100644
--- a/src/bonsai/bonsai/core/pset.py
+++ b/src/bonsai/bonsai/core/pset.py
@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Optional, Union, Any
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def copy_property_to_selection(
diff --git a/src/bonsai/bonsai/core/qto.py b/src/bonsai/bonsai/core/qto.py
index beb4b3fe79..85999684d9 100644
--- a/src/bonsai/bonsai/core/qto.py
+++ b/src/bonsai/bonsai/core/qto.py
@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import bpy
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def calculate_circle_radius(qto: tool.Qto, obj: bpy.types.Object) -> float:
diff --git a/src/bonsai/bonsai/core/resource.py b/src/bonsai/bonsai/core/resource.py
index e7399fd18c..b53fcc131b 100644
--- a/src/bonsai/bonsai/core/resource.py
+++ b/src/bonsai/bonsai/core/resource.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Optional, Union, Iterable
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def load_resources(resource: tool.Resource) -> None:
diff --git a/src/bonsai/bonsai/core/root.py b/src/bonsai/bonsai/core/root.py
index 165c717ed9..f45d0ee142 100644
--- a/src/bonsai/bonsai/core/root.py
+++ b/src/bonsai/bonsai/core/root.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def copy_class(
diff --git a/src/bonsai/bonsai/core/sequence.py b/src/bonsai/bonsai/core/sequence.py
index ff8b4455c6..558bf9556b 100644
--- a/src/bonsai/bonsai/core/sequence.py
+++ b/src/bonsai/bonsai/core/sequence.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Union
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_work_plan(ifc: tool.Ifc) -> ifcopenshell.entity_instance:
diff --git a/src/bonsai/bonsai/core/spatial.py b/src/bonsai/bonsai/core/spatial.py
index 08c0797137..955711d45c 100644
--- a/src/bonsai/bonsai/core/spatial.py
+++ b/src/bonsai/bonsai/core/spatial.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Union
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def reference_structure(
diff --git a/src/bonsai/bonsai/core/style.py b/src/bonsai/bonsai/core/style.py
index 964a45719f..347efb4fe0 100644
--- a/src/bonsai/bonsai/core/style.py
+++ b/src/bonsai/bonsai/core/style.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Optional, Any
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def add_style(ifc: tool.Ifc, style: tool.Style, obj: bpy.types.Material) -> ifcopenshell.entity_instance:
diff --git a/src/bonsai/bonsai/core/type.py b/src/bonsai/bonsai/core/type.py
index c94f556985..a7c334dfd5 100644
--- a/src/bonsai/bonsai/core/type.py
+++ b/src/bonsai/bonsai/core/type.py
@@ -17,13 +17,13 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import annotations
-import blenderbim.core.geometry
+import bonsai.core.geometry
 from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     import bpy
     import ifcopenshell
-    import blenderbim.tool as tool
+    import bonsai.tool as tool
 
 
 def assign_type(
diff --git a/src/bonsai/test/core/bootstrap.py b/src/bonsai/test/core/bootstrap.py
index 1a77630efc..efbe209f70 100644
--- a/src/bonsai/test/core/bootstrap.py
+++ b/src/bonsai/test/core/bootstrap.py
@@ -19,224 +19,224 @@
 import sys
 import json
 import pytest
-import blenderbim.core.tool
+import bonsai.core.tool
 from typing import Any, Optional
 from typing_extensions import Self
 
 
 @pytest.fixture
 def ifc():
-    prophet = Prophecy(blenderbim.core.tool.Ifc)
+    prophet = Prophecy(bonsai.core.tool.Ifc)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def blender():
-    prophet = Prophecy(blenderbim.core.tool.Blender)
+    prophet = Prophecy(bonsai.core.tool.Blender)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def brick():
-    prophet = Prophecy(blenderbim.core.tool.Brick)
+    prophet = Prophecy(bonsai.core.tool.Brick)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def aggregate():
-    prophet = Prophecy(blenderbim.core.tool.Aggregate)
+    prophet = Prophecy(bonsai.core.tool.Aggregate)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def collector():
-    prophet = Prophecy(blenderbim.core.tool.Collector)
+    prophet = Prophecy(bonsai.core.tool.Collector)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def context():
-    prophet = Prophecy(blenderbim.core.tool.Context)
+    prophet = Prophecy(bonsai.core.tool.Context)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def debug():
-    prophet = Prophecy(blenderbim.core.tool.Debug)
+    prophet = Prophecy(bonsai.core.tool.Debug)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def demo():
-    prophet = Prophecy(blenderbim.core.tool.Demo)
+    prophet = Prophecy(bonsai.core.tool.Demo)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def document():
-    prophet = Prophecy(blenderbim.core.tool.Document)
+    prophet = Prophecy(bonsai.core.tool.Document)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def drawing():
-    prophet = Prophecy(blenderbim.core.tool.Drawing)
+    prophet = Prophecy(bonsai.core.tool.Drawing)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def geometry():
-    prophet = Prophecy(blenderbim.core.tool.Geometry)
+    prophet = Prophecy(bonsai.core.tool.Geometry)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def georeference():
-    prophet = Prophecy(blenderbim.core.tool.Georeference)
+    prophet = Prophecy(bonsai.core.tool.Georeference)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def library():
-    prophet = Prophecy(blenderbim.core.tool.Library)
+    prophet = Prophecy(bonsai.core.tool.Library)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def material():
-    prophet = Prophecy(blenderbim.core.tool.Material)
+    prophet = Prophecy(bonsai.core.tool.Material)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def misc():
-    prophet = Prophecy(blenderbim.core.tool.Misc)
+    prophet = Prophecy(bonsai.core.tool.Misc)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def nest():
-    prophet = Prophecy(blenderbim.core.tool.Nest)
+    prophet = Prophecy(bonsai.core.tool.Nest)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def owner():
-    prophet = Prophecy(blenderbim.core.tool.Owner)
+    prophet = Prophecy(bonsai.core.tool.Owner)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def patch():
-    prophet = Prophecy(blenderbim.core.tool.Patch)
+    prophet = Prophecy(bonsai.core.tool.Patch)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def project():
-    prophet = Prophecy(blenderbim.core.tool.Project)
+    prophet = Prophecy(bonsai.core.tool.Project)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def pset():
-    prophet = Prophecy(blenderbim.core.tool.Pset)
+    prophet = Prophecy(bonsai.core.tool.Pset)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def qto():
-    prophet = Prophecy(blenderbim.core.tool.Qto)
+    prophet = Prophecy(bonsai.core.tool.Qto)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def root():
-    prophet = Prophecy(blenderbim.core.tool.Root)
+    prophet = Prophecy(bonsai.core.tool.Root)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def selector():
-    prophet = Prophecy(blenderbim.core.tool.Selector)
+    prophet = Prophecy(bonsai.core.tool.Selector)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def sequence():
-    prophet = Prophecy(blenderbim.core.tool.Sequence)
+    prophet = Prophecy(bonsai.core.tool.Sequence)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def spatial():
-    prophet = Prophecy(blenderbim.core.tool.Spatial)
+    prophet = Prophecy(bonsai.core.tool.Spatial)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def style():
-    prophet = Prophecy(blenderbim.core.tool.Style)
+    prophet = Prophecy(bonsai.core.tool.Style)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def surveyor():
-    prophet = Prophecy(blenderbim.core.tool.Surveyor)
+    prophet = Prophecy(bonsai.core.tool.Surveyor)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def system():
-    prophet = Prophecy(blenderbim.core.tool.System)
+    prophet = Prophecy(bonsai.core.tool.System)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def type():
-    prophet = Prophecy(blenderbim.core.tool.Type)
+    prophet = Prophecy(bonsai.core.tool.Type)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def unit():
-    prophet = Prophecy(blenderbim.core.tool.Unit)
+    prophet = Prophecy(bonsai.core.tool.Unit)
     yield prophet
     prophet.verify()
 
 
 @pytest.fixture
 def voider():
-    prophet = Prophecy(blenderbim.core.tool.Voider)
+    prophet = Prophecy(bonsai.core.tool.Voider)
     yield prophet
     prophet.verify()
 
diff --git a/src/bonsai/test/core/test_aggregate.py b/src/bonsai/test/core/test_aggregate.py
index 01cf03126f..157b1c3999 100644
--- a/src/bonsai/test/core/test_aggregate.py
+++ b/src/bonsai/test/core/test_aggregate.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.aggregate as subject
+import bonsai.core.aggregate as subject
 from test.core.bootstrap import ifc, aggregate, collector
 
 
diff --git a/src/bonsai/test/core/test_attribute.py b/src/bonsai/test/core/test_attribute.py
index 4dd3572aed..b16ce677bd 100644
--- a/src/bonsai/test/core/test_attribute.py
+++ b/src/bonsai/test/core/test_attribute.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.attribute as subject
+import bonsai.core.attribute as subject
 from test.core.bootstrap import ifc
 
 
diff --git a/src/bonsai/test/core/test_brick.py b/src/bonsai/test/core/test_brick.py
index 79b88a0573..10a4a7cfd1 100644
--- a/src/bonsai/test/core/test_brick.py
+++ b/src/bonsai/test/core/test_brick.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.brick as subject
+import bonsai.core.brick as subject
 from test.core.bootstrap import ifc, brick
 
 
diff --git a/src/bonsai/test/core/test_context.py b/src/bonsai/test/core/test_context.py
index fd13690183..7388754765 100644
--- a/src/bonsai/test/core/test_context.py
+++ b/src/bonsai/test/core/test_context.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.context as subject
+import bonsai.core.context as subject
 from test.core.bootstrap import ifc, context
 
 
diff --git a/src/bonsai/test/core/test_debug.py b/src/bonsai/test/core/test_debug.py
index 35a8825944..4384c0abd1 100644
--- a/src/bonsai/test/core/test_debug.py
+++ b/src/bonsai/test/core/test_debug.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.debug as subject
+import bonsai.core.debug as subject
 from test.core.bootstrap import debug
 
 
diff --git a/src/bonsai/test/core/test_demo.py b/src/bonsai/test/core/test_demo.py
index 5052ecb750..6b2700fbfd 100644
--- a/src/bonsai/test/core/test_demo.py
+++ b/src/bonsai/test/core/test_demo.py
@@ -37,7 +37,7 @@
 
 # We always call the module we're testing the "test subject". This makes our
 # tests simple to read: just look for where the "subject" is called!
-import blenderbim.core.demo as subject
+import bonsai.core.demo as subject
 
 # These are like mocks, stubs, or spy objects. They don't do anything, but they
 # let us check our test expectations.
diff --git a/src/bonsai/test/core/test_document.py b/src/bonsai/test/core/test_document.py
index a684f3c395..48421c1fe4 100644
--- a/src/bonsai/test/core/test_document.py
+++ b/src/bonsai/test/core/test_document.py
@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import blenderbim.core.document as subject
+import bonsai.core.document as subject
 from test.core.bootstrap import ifc, document
 
 
diff --git a/src/bonsai/test/core/test_drawing.py b/src/bonsai/test/core/test_drawing.py
index 078b53ca6e..97dfa62220 100644
--- a/src/bonsai/test/core/test_drawing.py
+++ b/src/bonsai/test/core/test_drawing.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.drawing as subject
+import bonsai.core.drawing as subject
 from test.core.bootstrap import ifc, drawing, collector
 
 
diff --git a/src/bonsai/test/core/test_geometry.py b/src/bonsai/test/core/test_geometry.py
index 680f18a023..2c9a052cee 100644
--- a/src/bonsai/test/core/test_geometry.py
+++ b/src/bonsai/test/core/test_geometry.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.geometry as subject
+import bonsai.core.geometry as subject
 import test.core.test_style
 from test.core.bootstrap import ifc, surveyor, geometry, style
 
diff --git a/src/bonsai/test/core/test_georeference.py b/src/bonsai/test/core/test_georeference.py
index b029e12b4c..6048ae5828 100644
--- a/src/bonsai/test/core/test_georeference.py
+++ b/src/bonsai/test/core/test_georeference.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.georeference as subject
+import bonsai.core.georeference as subject
 from test.core.bootstrap import ifc, georeference
 
 
diff --git a/src/bonsai/test/core/test_library.py b/src/bonsai/test/core/test_library.py
index 5b158eae20..f1f40a337e 100644
--- a/src/bonsai/test/core/test_library.py
+++ b/src/bonsai/test/core/test_library.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.library as subject
+import bonsai.core.library as subject
 from test.core.bootstrap import ifc, library
 
 
diff --git a/src/bonsai/test/core/test_material.py b/src/bonsai/test/core/test_material.py
index d978fa952b..f95ddea746 100644
--- a/src/bonsai/test/core/test_material.py
+++ b/src/bonsai/test/core/test_material.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.material as subject
+import bonsai.core.material as subject
 from test.core.bootstrap import ifc, material, style, spatial
 
 
diff --git a/src/bonsai/test/core/test_misc.py b/src/bonsai/test/core/test_misc.py
index 97b9ef5da2..568bee3f21 100644
--- a/src/bonsai/test/core/test_misc.py
+++ b/src/bonsai/test/core/test_misc.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.misc as subject
+import bonsai.core.misc as subject
 from test.core.bootstrap import misc
 
 
diff --git a/src/bonsai/test/core/test_nest.py b/src/bonsai/test/core/test_nest.py
index 3cfe0de12d..d2eefc9109 100644
--- a/src/bonsai/test/core/test_nest.py
+++ b/src/bonsai/test/core/test_nest.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.nest as subject
+import bonsai.core.nest as subject
 from test.core.bootstrap import ifc, nest, collector
 
 
diff --git a/src/bonsai/test/core/test_owner.py b/src/bonsai/test/core/test_owner.py
index 4d4d5d8616..8108a0437d 100644
--- a/src/bonsai/test/core/test_owner.py
+++ b/src/bonsai/test/core/test_owner.py
@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import blenderbim.core.owner as subject
+import bonsai.core.owner as subject
 from test.core.bootstrap import ifc, owner
 
 
diff --git a/src/bonsai/test/core/test_patch.py b/src/bonsai/test/core/test_patch.py
index 44c7d6cdb5..fb970ed6ac 100644
--- a/src/bonsai/test/core/test_patch.py
+++ b/src/bonsai/test/core/test_patch.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.patch as subject
+import bonsai.core.patch as subject
 from test.core.bootstrap import patch
 
 
diff --git a/src/bonsai/test/core/test_project.py b/src/bonsai/test/core/test_project.py
index a0652c483b..0d3ad32690 100644
--- a/src/bonsai/test/core/test_project.py
+++ b/src/bonsai/test/core/test_project.py
@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import blenderbim.core.project as subject
+import bonsai.core.project as subject
 from test.core.bootstrap import ifc, project, spatial, georeference
 
 
diff --git a/src/bonsai/test/core/test_pset.py b/src/bonsai/test/core/test_pset.py
index 051430230a..39f0dde47d 100644
--- a/src/bonsai/test/core/test_pset.py
+++ b/src/bonsai/test/core/test_pset.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.pset as subject
+import bonsai.core.pset as subject
 from test.core.bootstrap import ifc, pset
 
 
diff --git a/src/bonsai/test/core/test_qto.py b/src/bonsai/test/core/test_qto.py
index dc31e9328a..6bf00f5bc9 100644
--- a/src/bonsai/test/core/test_qto.py
+++ b/src/bonsai/test/core/test_qto.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.qto as subject
+import bonsai.core.qto as subject
 from test.core.bootstrap import qto
 
 
diff --git a/src/bonsai/test/core/test_root.py b/src/bonsai/test/core/test_root.py
index be467e1d14..9baff7d962 100644
--- a/src/bonsai/test/core/test_root.py
+++ b/src/bonsai/test/core/test_root.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.root as subject
+import bonsai.core.root as subject
 import test.core.test_geometry
 from test.core.bootstrap import ifc, collector, geometry, root
 
diff --git a/src/bonsai/test/core/test_sequence.py b/src/bonsai/test/core/test_sequence.py
index bca69d9351..f89f56e63a 100644
--- a/src/bonsai/test/core/test_sequence.py
+++ b/src/bonsai/test/core/test_sequence.py
@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import blenderbim.core.sequence as subject
+import bonsai.core.sequence as subject
 from test.core.bootstrap import ifc, sequence
 
 
diff --git a/src/bonsai/test/core/test_spatial.py b/src/bonsai/test/core/test_spatial.py
index 9becaa1570..2cd0d0f5cc 100644
--- a/src/bonsai/test/core/test_spatial.py
+++ b/src/bonsai/test/core/test_spatial.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.spatial as subject
+import bonsai.core.spatial as subject
 from test.core.bootstrap import ifc, collector, spatial
 
 
diff --git a/src/bonsai/test/core/test_style.py b/src/bonsai/test/core/test_style.py
index 0d8f0c34f5..41c7abed77 100644
--- a/src/bonsai/test/core/test_style.py
+++ b/src/bonsai/test/core/test_style.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.style as subject
+import bonsai.core.style as subject
 from test.core.bootstrap import ifc, material, style, spatial
 
 
diff --git a/src/bonsai/test/core/test_system.py b/src/bonsai/test/core/test_system.py
index 6a92730907..ace4461aeb 100644
--- a/src/bonsai/test/core/test_system.py
+++ b/src/bonsai/test/core/test_system.py
@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import blenderbim.core.system as subject
+import bonsai.core.system as subject
 from test.core.bootstrap import ifc, system, spatial
 
 
diff --git a/src/bonsai/test/core/test_type.py b/src/bonsai/test/core/test_type.py
index 2033856ecb..68130c1fa8 100644
--- a/src/bonsai/test/core/test_type.py
+++ b/src/bonsai/test/core/test_type.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.type as subject
+import bonsai.core.type as subject
 from test.core.bootstrap import ifc, type, geometry
 
 
diff --git a/src/bonsai/test/core/test_unit.py b/src/bonsai/test/core/test_unit.py
index 25ae0d7be0..d79b6b83fb 100644
--- a/src/bonsai/test/core/test_unit.py
+++ b/src/bonsai/test/core/test_unit.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.core.unit as subject
+import bonsai.core.unit as subject
 from test.core.bootstrap import ifc, unit