diff --git a/src/blenderbim/Makefile b/src/blenderbim/Makefile
index a23ade34a4..1548f6b72d 100644
--- a/src/blenderbim/Makefile
+++ b/src/blenderbim/Makefile
@@ -61,7 +61,7 @@ endif
 	cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/blenderbim/libs/site/packages/
 
 	# See bug #812
-	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/ifcblenderexport/occ_utils.py
+	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/blenderbim/occ_utils.py
 	cd dist/working && mv occ_utils.py ../blenderbim/libs/site/packages/ifcopenshell/geom/occ_utils.py
 	rm -rf dist/working
 
diff --git a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A1.svg b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A1.svg
index 9b8b8be18b..de252c4203 100644
--- a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A1.svg
+++ b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A1.svg
@@ -25,7 +25,7 @@
     </rdf:RDF>
   </metadata>
   <desc
-     id="desc89610">/home/dion/Projects/IfcOpenShell/src/ifcblenderexport/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
+     id="desc89610">/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
   <rect
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.07874;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
      id="rect1036"
diff --git a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A2.svg b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A2.svg
index f450a15cfb..76c5fe243b 100644
--- a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A2.svg
+++ b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A2.svg
@@ -25,7 +25,7 @@
     </rdf:RDF>
   </metadata>
   <desc
-     id="desc89610">/home/dion/Projects/IfcOpenShell/src/ifcblenderexport/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
+     id="desc89610">/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
   <rect
      y="3.1753578e-05"
      x="-4.3300333e-05"
diff --git a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A3.svg b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A3.svg
index 0f570cc865..dcd132e710 100644
--- a/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A3.svg
+++ b/src/blenderbim/blenderbim/bim/data/templates/titleblocks/A3.svg
@@ -25,7 +25,7 @@
     </rdf:RDF>
   </metadata>
   <desc
-     id="desc89610">/home/dion/Projects/IfcOpenShell/src/ifcblenderexport/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
+     id="desc89610">/home/dion/Projects/IfcOpenShell/src/blenderbim/titleblock.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = manual</desc>
   <rect
      y="3.1753578e-05"
      x="-4.3300333e-05"
diff --git a/src/blenderbim/docs/blenderbim/installation.rst b/src/blenderbim/docs/blenderbim/installation.rst
index 7c4df4ff3c..f1d8e5101e 100644
--- a/src/blenderbim/docs/blenderbim/installation.rst
+++ b/src/blenderbim/docs/blenderbim/installation.rst
@@ -73,7 +73,7 @@ how to use Git, you can also stay up to date like so:
     $ git checkout v0.6.0
 
 Then, just copy the files from the source code's
-``src/ifcblenderexport/blenderbim/`` folder and replace the files in your
+``src/blenderbim/blenderbim/`` folder and replace the files in your
 Blender add-on's ``blenderbim/`` folder.
 
 Restart Blender for the changes to take effect. In ``Edit > Preferences >
diff --git a/src/blenderbim/get_description.py b/src/blenderbim/get_description.py
index 2c60f47468..09846d8fae 100644
--- a/src/blenderbim/get_description.py
+++ b/src/blenderbim/get_description.py
@@ -37,7 +37,7 @@ class Describer:
             f.write(json.dumps(self.enum_descriptions, indent=4))
 
     def get_html_sources(self):
-        html_dir = "/home/dion/Projects/IfcOpenShell/src/ifcblenderexport/descriptions/IFC4_3/RC1/HTML"
+        html_dir = "/home/dion/Projects/IfcOpenShell/src/blenderbim/descriptions/IFC4_3/RC1/HTML"
         for filename in Path(html_dir).rglob("*.htm"):
             if "lexical" not in str(filename):
                 continue
diff --git a/src/ifcbimtester/patch/model_core.patch b/src/ifcbimtester/patch/model_core.patch
index 9452fd4985..77f0badc9a 100644
--- a/src/ifcbimtester/patch/model_core.patch
+++ b/src/ifcbimtester/patch/model_core.patch
@@ -1,5 +1,5 @@
 --- behave/model_core.py	2018-02-26 02:53:03.000000000 +1100
-+++ /home/dion/Projects/IfcOpenShell/src/ifcblenderexport/patch-behave-model_core.py	2021-03-21 11:57:27.625195794 +1100
++++ /home/dion/Projects/IfcOpenShell/src/blenderbim/patch-behave-model_core.py	2021-03-21 11:57:27.625195794 +1100
 @@ -269,7 +269,10 @@
  class BasicStatement(object):
      def __init__(self, filename, line, keyword, name):
diff --git a/src/ifcbimtester/patch/runner_util.patch b/src/ifcbimtester/patch/runner_util.patch
index d6a5ba7729..2362da317c 100644
--- a/src/ifcbimtester/patch/runner_util.patch
+++ b/src/ifcbimtester/patch/runner_util.patch
@@ -1,5 +1,5 @@
 --- behave/runner_util.py	2018-02-26 02:53:03.000000000 +1100
-+++ /home/dion/Projects/IfcOpenShell/src/ifcblenderexport/patch-behave-runner_util.py	2021-03-21 11:58:29.777638958 +1100
++++ /home/dion/Projects/IfcOpenShell/src/blenderbim/patch-behave-runner_util.py	2021-03-21 11:58:29.777638958 +1100
 @@ -381,7 +381,10 @@
      locals_["__file__"] = filename
      with open(filename, "rb") as f:
diff --git a/src/ifccobie/get_maintainable_assets.py b/src/ifccobie/get_maintainable_assets.py
index b4a599e0cd..1e71ac50d5 100644
--- a/src/ifccobie/get_maintainable_assets.py
+++ b/src/ifccobie/get_maintainable_assets.py
@@ -2,9 +2,9 @@ import json
 import ifcopenshell
 import ifcopenshell.util.selector
 
-with open("../ifcblenderexport/blenderbim/bim/schema/entity_descriptions.json") as f:
+with open("../blenderbim/blenderbim/bim/schema/entity_descriptions.json") as f:
     entity_descriptions = json.load(f)
-with open("../ifcblenderexport/blenderbim/bim/schema/enum_descriptions.json") as f:
+with open("../blenderbim/blenderbim/bim/schema/enum_descriptions.json") as f:
     enum_descriptions = json.load(f)
 
 print('{|class="wikitable"')