diff --git a/tools/common/include/commoneditor.hpp b/tools/common/include/commoneditor.hpp
index 50bfaee..3e9161f 100755
--- a/tools/common/include/commoneditor.hpp
+++ b/tools/common/include/commoneditor.hpp
@@ -155,7 +155,7 @@ public:
     
     void set_undo_stack(UndoStack* stack);
 
-    Object selected_object = NullObject;
+    Object selected_object = prism::NullObject;
     
     GFXTexture* get_material_preview(Material& material);
     GFXTexture* get_mesh_preview(Mesh& mesh);
@@ -349,7 +349,7 @@ private:
 	int defaultX, defaultY, defaultWidth, defaultHeight;
 	std::vector<std::string> lastOpenedFiles;
 
-    void walkObject(Object object, Object parentObject = NullObject);
+    void walkObject(Object object, Object parentObject = prism::NullObject);
     
     void editTransform(Object object, Transform transform);
     void editRenderable(Renderable& mesh);
diff --git a/tools/common/include/debugpass.hpp b/tools/common/include/debugpass.hpp
index 43d917f..b1a1ea5 100755
--- a/tools/common/include/debugpass.hpp
+++ b/tools/common/include/debugpass.hpp
@@ -65,7 +65,7 @@ public:
     GFXTexture* selectDepthTexture = nullptr;
     GFXTexture* sobelTexture = nullptr;
 
-    Object selected_object = NullObject;
+    Object selected_object = prism::NullObject;
     
 private:
     void createOffscreenResources();
diff --git a/tools/common/src/commoneditor.cpp b/tools/common/src/commoneditor.cpp
index c727df2..f63f301 100755
--- a/tools/common/src/commoneditor.cpp
+++ b/tools/common/src/commoneditor.cpp
@@ -127,8 +127,8 @@ void CommonEditor::update(float deltaTime) {
         if(debugPass != nullptr) {
             if(engine->get_input()->is_pressed("cameraSelect") && accepting_viewport_input && !transforming_axis) {
                 debugPass->get_selected_object(viewport_x, viewport_y, [this](SelectableObject object) {
-                    if(object.object == NullObject) {
-                        object_selected(NullObject);
+                    if(object.object == prism::NullObject) {
+                        object_selected(prism::NullObject);
                         return;
                     }
                     
@@ -370,7 +370,7 @@ void CommonEditor::drawOutline() {
         ImGui::BeginChild("outlineinner", ImVec2(-1, -1), true);
         
         for(auto& object : engine->get_scene()->get_objects()) {
-            if(engine->get_scene()->get(object).parent == NullObject)
+            if(engine->get_scene()->get(object).parent == prism::NullObject)
                 walkObject(object);
         }
         
@@ -524,9 +524,9 @@ bool componentHeader(Scene& scene, Object& object, const char* name, const bool
 void CommonEditor::drawPropertyEditor() {
     auto scene = engine->get_scene();
     if(scene != nullptr) {
-        if(selected_object != NullObject) {
+        if(selected_object != prism::NullObject) {
             if(!scene->has<Data>(selected_object)) {
-                selected_object = NullObject;
+                selected_object = prism::NullObject;
                 return;
             }
             
@@ -548,7 +548,7 @@ void CommonEditor::drawPropertyEditor() {
                     command.old_name = stored_name;
                 }
                 
-                std::string preview_value = data.parent == NullObject ? "None" : scene->get(data.parent).name;
+                std::string preview_value = data.parent == prism::NullObject ? "None" : scene->get(data.parent).name;
                 if(ImGui::BeginCombo("Parent", preview_value.c_str())) {
                     for (auto& object : scene->get_objects()) {
                         // dont allow selecting a node to be the parent of itself
@@ -561,8 +561,8 @@ void CommonEditor::drawPropertyEditor() {
                     
                     ImGui::Separator();
                     
-                    if (ImGui::Selectable("None", data.parent == NullObject))
-                        data.parent = NullObject;
+                    if (ImGui::Selectable("None", data.parent == prism::NullObject))
+                        data.parent = prism::NullObject;
                     
                     ImGui::EndCombo();
                 }
diff --git a/tools/common/src/debugpass.cpp b/tools/common/src/debugpass.cpp
index ce745dc..3786fe1 100755
--- a/tools/common/src/debugpass.cpp
+++ b/tools/common/src/debugpass.cpp
@@ -368,7 +368,7 @@ void DebugPass::render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) {
     commandBuffer->set_graphics_pipeline(arrow_pipeline);
     
     // draw handles for selected object;
-    if(selected_object != NullObject && engine->get_scene()->has<Transform>(selected_object)) {
+    if(selected_object != prism::NullObject && engine->get_scene()->has<Transform>(selected_object)) {
         const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position();
         
         const float base_scale = 0.05f;
@@ -395,7 +395,7 @@ void DebugPass::render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) {
 
     commandBuffer->set_render_pass(info);
     
-    if(selected_object != NullObject && engine->get_scene()->has<Renderable>(selected_object)) {
+    if(selected_object != prism::NullObject && engine->get_scene()->has<Renderable>(selected_object)) {
         commandBuffer->set_graphics_pipeline(sobelPipeline);
 
         auto renderable = engine->get_scene()->get<Renderable>(selected_object);
@@ -474,7 +474,7 @@ void DebugPass::get_selected_object(int x, int y, std::function<void(SelectableO
         selectable_objects.push_back(so);
     };
     
-    if(selected_object != NullObject) {
+    if(selected_object != prism::NullObject) {
         const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position();
         
         const float base_scale = 0.05f;
@@ -575,7 +575,7 @@ void DebugPass::get_selected_object(int x, int y, std::function<void(SelectableO
         callback(selectable_objects[id]);
     } else {
         SelectableObject o;
-        o.object = NullObject;
+        o.object = prism::NullObject;
         callback(o);
     }
 }