diff --git a/clutter/ground_clutter_2d.h b/clutter/ground_clutter_2d.h
index 981c6ca..a562703 100644
--- a/clutter/ground_clutter_2d.h
+++ b/clutter/ground_clutter_2d.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef GROUND_CLUTTER_H
-#define GROUND_CLUTTER_H
+#ifndef GROUND_CLUTTER_2D_H
+#define GROUND_CLUTTER_2D_H
 
 #include "core/version.h"
 
diff --git a/clutter/ground_clutter_2d_foliage.h b/clutter/ground_clutter_2d_foliage.h
index c51caa1..074b621 100644
--- a/clutter/ground_clutter_2d_foliage.h
+++ b/clutter/ground_clutter_2d_foliage.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef GROUND_CLUTTER_FOLIAGE_H
-#define GROUND_CLUTTER_FOLIAGE_H
+#ifndef GROUND_CLUTTER_FOLIAGE_2D_H
+#define GROUND_CLUTTER_FOLIAGE_2D_H
 
 #include "core/version.h"
 
diff --git a/editor/prop_2d_editor_plugin.h b/editor/prop_2d_editor_plugin.h
index f764755..113dd20 100644
--- a/editor/prop_2d_editor_plugin.h
+++ b/editor/prop_2d_editor_plugin.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_EDITOR_PLUGIN_H
-#define PROP_EDITOR_PLUGIN_H
+#ifndef PROP_2D_EDITOR_PLUGIN_H
+#define PROP_2D_EDITOR_PLUGIN_H
 
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
diff --git a/jobs/prop_2d_mesher_job_step.cpp b/jobs/prop_2d_mesher_job_step.cpp
index dd7929a..61161c8 100644
--- a/jobs/prop_2d_mesher_job_step.cpp
+++ b/jobs/prop_2d_mesher_job_step.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "prop_2d_mesher_job_step.h"
 
-const String PropMesherJobStep::BINDING_STRING_PROP_MESHER_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh";
+const String PropMesherJobStep::BINDING_STRING_PROP_2D_MESHER_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh";
 
 PropMesherJobStep::PropMesherJobStepType PropMesherJobStep::get_job_type() const {
 	return _job_type;
@@ -89,7 +89,7 @@ PropMesherJobStep::~PropMesherJobStep() {
 void PropMesherJobStep::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_job_type"), &PropMesherJobStep::get_job_type);
 	ClassDB::bind_method(D_METHOD("set_job_type", "value"), &PropMesherJobStep::set_job_type);
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "job_type", PROPERTY_HINT_ENUM, PropMesherJobStep::BINDING_STRING_PROP_MESHER_JOB_STEP_TYPE), "set_job_type", "get_job_type");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "job_type", PROPERTY_HINT_ENUM, PropMesherJobStep::BINDING_STRING_PROP_2D_MESHER_JOB_STEP_TYPE), "set_job_type", "get_job_type");
 
 	ClassDB::bind_method(D_METHOD("get_lod_index"), &PropMesherJobStep::get_lod_index);
 	ClassDB::bind_method(D_METHOD("set_lod_index", "value"), &PropMesherJobStep::set_lod_index);
diff --git a/jobs/prop_2d_mesher_job_step.h b/jobs/prop_2d_mesher_job_step.h
index 4ed5791..5ea9465 100644
--- a/jobs/prop_2d_mesher_job_step.h
+++ b/jobs/prop_2d_mesher_job_step.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MESHER_JOB_STEP_H
-#define PROP_MESHER_JOB_STEP_H
+#ifndef PROP_2D_MESHER_JOB_STEP_H
+#define PROP_2D_MESHER_JOB_STEP_H
 
 #include "core/version.h"
 
@@ -53,7 +53,7 @@ public:
 		TYPE_OTHER,
 	};
 
-	static const String BINDING_STRING_PROP_MESHER_JOB_STEP_TYPE;
+	static const String BINDING_STRING_PROP_2D_MESHER_JOB_STEP_TYPE;
 
 	PropMesherJobStepType get_job_type() const;
 	void set_job_type(const PropMesherJobStepType value);
diff --git a/jobs/prop_2d_texture_job.h b/jobs/prop_2d_texture_job.h
index 526a28d..06e313d 100644
--- a/jobs/prop_2d_texture_job.h
+++ b/jobs/prop_2d_texture_job.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_TEXTURE_JOB
-#define PROP_TEXTURE_JOB
+#ifndef PROP_2D_TEXTURE_JOB
+#define PROP_2D_TEXTURE_JOB
 
 #include "scene/resources/texture.h"
 
diff --git a/lights/prop_2d_light.h b/lights/prop_2d_light.h
index 0778d4f..f79e12c 100644
--- a/lights/prop_2d_light.h
+++ b/lights/prop_2d_light.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_LIGHT_H
-#define PROP_LIGHT_H
+#ifndef PROP_2D_LIGHT_H
+#define PROP_2D_LIGHT_H
 
 #include "core/version.h"
 
diff --git a/material_cache/prop_2d_material_cache.h b/material_cache/prop_2d_material_cache.h
index 77c175e..e3721ba 100644
--- a/material_cache/prop_2d_material_cache.h
+++ b/material_cache/prop_2d_material_cache.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MATERIAL_CACHE_H
-#define PROP_MATERIAL_CACHE_H
+#ifndef PROP_2D_MATERIAL_CACHE_H
+#define PROP_2D_MATERIAL_CACHE_H
 
 #include "core/version.h"
 
diff --git a/material_cache/prop_2d_material_cache_pcm.h b/material_cache/prop_2d_material_cache_pcm.h
index 2c18bcd..d95257a 100644
--- a/material_cache/prop_2d_material_cache_pcm.h
+++ b/material_cache/prop_2d_material_cache_pcm.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MATERIAL_CACHE_PCM_H
-#define PROP_MATERIAL_CACHE_PCM_H
+#ifndef PROP_2D_MATERIAL_CACHE_PCM_H
+#define PROP_2D_MATERIAL_CACHE_PCM_H
 
 #include "prop_2d_material_cache.h"
 
diff --git a/prop_2d_ess_entity.h b/prop_2d_ess_entity.h
index f703a20..922dbb9 100644
--- a/prop_2d_ess_entity.h
+++ b/prop_2d_ess_entity.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_ESS_ENTITY_H
-#define PROP_ESS_ENTITY_H
+#ifndef PROP_2D_ESS_ENTITY_H
+#define PROP_2D_ESS_ENTITY_H
 
 #include "core/version.h"
 
diff --git a/prop_2d_instance.h b/prop_2d_instance.h
index 3324b74..d425da7 100644
--- a/prop_2d_instance.h
+++ b/prop_2d_instance.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_H
-#define PROP_INSTANCE_H
+#ifndef PROP_2D_INSTANCE_H
+#define PROP_2D_INSTANCE_H
 
 #include "core/version.h"
 
diff --git a/prop_2d_instance_job.h b/prop_2d_instance_job.h
index 65d66b5..657797f 100644
--- a/prop_2d_instance_job.h
+++ b/prop_2d_instance_job.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_JOB
-#define PROP_INSTANCE_JOB
+#ifndef PROP_2D_INSTANCE_JOB
+#define PROP_2D_INSTANCE_JOB
 
 #include "scene/resources/texture.h"
 
diff --git a/prop_2d_instance_merger.h b/prop_2d_instance_merger.h
index 6b6101b..4f1893c 100644
--- a/prop_2d_instance_merger.h
+++ b/prop_2d_instance_merger.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_MERGER_H
-#define PROP_INSTANCE_MERGER_H
+#ifndef PROP_2D_INSTANCE_MERGER_H
+#define PROP_2D_INSTANCE_MERGER_H
 
 #include "prop_2d_instance.h"
 
diff --git a/prop_2d_instance_prop_job.h b/prop_2d_instance_prop_job.h
index 9820693..a618cba 100644
--- a/prop_2d_instance_prop_job.h
+++ b/prop_2d_instance_prop_job.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_JOB_H
-#define PROP_JOB_H
+#ifndef PROP_2D_JOB_H
+#define PROP_2D_JOB_H
 
 #include "prop_2d_instance_job.h"
 
diff --git a/prop_2d_mesher.h b/prop_2d_mesher.h
index c648b4a..18da638 100644
--- a/prop_2d_mesher.h
+++ b/prop_2d_mesher.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MESHER_H
-#define PROP_MESHER_H
+#ifndef PROP_2D_MESHER_H
+#define PROP_2D_MESHER_H
 
 #include "core/version.h"
 
diff --git a/prop_2d_scene_instance.h b/prop_2d_scene_instance.h
index 9d9921b..505a66b 100644
--- a/prop_2d_scene_instance.h
+++ b/prop_2d_scene_instance.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_SCENE_INSTANCE_H
-#define PROP_SCENE_INSTANCE_H
+#ifndef PROP_2D_SCENE_INSTANCE_H
+#define PROP_2D_SCENE_INSTANCE_H
 
 #include "core/version.h"
 
diff --git a/props/prop_2d_data.h b/props/prop_2d_data.h
index af2e87f..984ed6b 100644
--- a/props/prop_2d_data.h
+++ b/props/prop_2d_data.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_H
-#define PROP_DATA_H
+#ifndef PROP_2D_DATA_H
+#define PROP_2D_DATA_H
 
 #include "core/version.h"
 
diff --git a/props/prop_2d_data_entry.h b/props/prop_2d_data_entry.h
index ceeafa7..54015ed 100644
--- a/props/prop_2d_data_entry.h
+++ b/props/prop_2d_data_entry.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_DATA_H
-#define PROP_DATA_DATA_H
+#ifndef PROP_2D_DATA_DATA_H
+#define PROP_2D_DATA_DATA_H
 
 #include "core/version.h"
 
diff --git a/props/prop_2d_data_light.h b/props/prop_2d_data_light.h
index fc90167..4e45fee 100644
--- a/props/prop_2d_data_light.h
+++ b/props/prop_2d_data_light.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_LIGHT_H
-#define PROP_DATA_LIGHT_H
+#ifndef PROP_2D_DATA_LIGHT_H
+#define PROP_2D_DATA_LIGHT_H
 
 #include "core/version.h"
 
diff --git a/props/prop_2d_data_portal.h b/props/prop_2d_data_portal.h
index b93fc28..11007dc 100644
--- a/props/prop_2d_data_portal.h
+++ b/props/prop_2d_data_portal.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_PORTAL_H
-#define PROP_DATA_PORTAL_H
+#ifndef PROP_2D_DATA_PORTAL_H
+#define PROP_2D_DATA_PORTAL_H
 
 #include "core/version.h"
 
diff --git a/props/prop_2d_data_prop.h b/props/prop_2d_data_prop.h
index 7973843..606ccef 100644
--- a/props/prop_2d_data_prop.h
+++ b/props/prop_2d_data_prop.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_PROP_H
-#define PROP_DATA_PROP_H
+#ifndef PROP_2D_DATA_PROP_2D_H
+#define PROP_2D_DATA_PROP_2D_H
 
 #include "core/math/vector3.h"
 
diff --git a/props/prop_2d_data_scene.h b/props/prop_2d_data_scene.h
index 5abf86b..bf01f79 100644
--- a/props/prop_2d_data_scene.h
+++ b/props/prop_2d_data_scene.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_SCENE_H
-#define PROP_DATA_SCENE_H
+#ifndef PROP_2D_DATA_SCENE_H
+#define PROP_2D_DATA_SCENE_H
 
 #include "core/math/vector3.h"
 #include "prop_2d_data_entry.h"
diff --git a/props/prop_2d_data_tiled_wall_2d.h b/props/prop_2d_data_tiled_wall_2d.h
index 1790f0f..647c3f7 100644
--- a/props/prop_2d_data_tiled_wall_2d.h
+++ b/props/prop_2d_data_tiled_wall_2d.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_TILED_WALL_H
-#define PROP_DATA_TILED_WALL_H
+#ifndef PROP_2D_DATA_TILED_WALL_H
+#define PROP_2D_DATA_TILED_WALL_H
 
 #include "core/math/vector3.h"
 #include "prop_2d_data_entry.h"
diff --git a/register_types.h b/register_types.h
index e32eae7..c68b37a 100644
--- a/register_types.h
+++ b/register_types.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROPS_REGISTER_TYPES_H
-#define PROPS_REGISTER_TYPES_H
+#ifndef PROPS_2D_REGISTER_TYPES_H
+#define PROPS_2D_REGISTER_TYPES_H
 
 void register_props_2d_types();
 void unregister_props_2d_types();
diff --git a/singleton/prop_2d_cache.h b/singleton/prop_2d_cache.h
index af84785..1872e8c 100644
--- a/singleton/prop_2d_cache.h
+++ b/singleton/prop_2d_cache.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_CACHE_H
-#define PROP_CACHE_H
+#ifndef PROP_2D_CACHE_H
+#define PROP_2D_CACHE_H
 
 #include "core/version.h"
 
diff --git a/singleton/prop_2d_utils.h b/singleton/prop_2d_utils.h
index 32dcc54..8d072a4 100644
--- a/singleton/prop_2d_utils.h
+++ b/singleton/prop_2d_utils.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_UTILS_H
-#define PROP_UTILS_H
+#ifndef PROP_2D_UTILS_H
+#define PROP_2D_UTILS_H
 
 #include "core/version.h"
 
diff --git a/tiled_wall/tiled_wall_2d.h b/tiled_wall/tiled_wall_2d.h
index 5e54962..37fc958 100644
--- a/tiled_wall/tiled_wall_2d.h
+++ b/tiled_wall/tiled_wall_2d.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef TILED_WALL_H
-#define TILED_WALL_H
+#ifndef TILED_WALL_2D_H
+#define TILED_WALL_2D_H
 
 #include "core/version.h"
 #include "scene/resources/texture.h"
diff --git a/tiled_wall/tiled_wall_2d_data.h b/tiled_wall/tiled_wall_2d_data.h
index eeeb422..47103f4 100644
--- a/tiled_wall/tiled_wall_2d_data.h
+++ b/tiled_wall/tiled_wall_2d_data.h
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef TILED_WALL_DATA_H
-#define TILED_WALL_DATA_H
+#ifndef TILED_WALL_2D_DATA_H
+#define TILED_WALL_2D_DATA_H
 
 #include "core/version.h"