diff --git a/core/build-config/include_paths.txt b/core/build-config/include_paths.txt
index 45c9e10..d1a02c3 100644
--- a/core/build-config/include_paths.txt
+++ b/core/build-config/include_paths.txt
@@ -1,3 +1,2 @@
-core/exports/
 .build/depends/libRR/Core/core/exports/
 .build/depends/libRR/Core/platform/exports/
\ No newline at end of file
diff --git a/core/exports/maintree/maintree.h b/core/exports/maintree/maintree.h
index d02582d..bc091bb 100644
--- a/core/exports/maintree/maintree.h
+++ b/core/exports/maintree/maintree.h
@@ -43,7 +43,7 @@ void mt_add_create_effector(MtType type, char *effector_name, mt_entity_effector
 void mt_add_delete_effector(MtType type, char *effector_name, mt_entity_effector_fn function, void *userdata);
 void mt_add_entity_tick_effector(MtType type, char *effector_name, usz_t ticks_delta, mt_entity_effector_fn function, void *userdata);
 void mt_add_tick_effector(MtState state, char *effector_name, usz_t ticks_delta, mt_entity_effector_fn function, void *userdata);
-void mt_task_remove_effector(MtState task, const char *effector_name);
+void mt_remove_effector(MtState state, const char *effector_name);
 
 /// @brief Adds a tick effector which only acts upon entitys with certain tags.
 /// @param type The type for which to add the tick effector.
@@ -61,15 +61,15 @@ void mt_tag_vec2(MtEntity entity, char *name, rr_vec2f_s vector);
 void mt_tag_vec3(MtEntity entity, char *name, rr_vec2f_s vector);
 void mt_tag_vec4(MtEntity entity, char *name, rr_vec4f_s vector);
 
-i64_t mt_untag_i64(MtEntity entity, char *name);
-f64_t mt_untag_f64(MtEntity entity, char *name);
-char * mt_untag_str(MtEntity entity, char *name);
-void * mt_untag_ptr(MtEntity entity, char *name);
-rr_vec2f_s mt_untag_vec2(MtEntity entity, char *name);
-rr_vec3f_s mt_untag_vec3(MtEntity entity, char *name);
-rr_vec4f_s mt_untag_vec4(MtEntity entity, char *name);
-
+void mt_untag(MtEntity entity, char *name);
 
+i64_t mt_get_i64_tag(MtEntity entity, char *name);
+f64_t mt_get_f64_tag(MtEntity entity, char *name);
+char * mt_get_str_tag(MtEntity entity, char *name);
+void * mt_get_ptr_tag(MtEntity entity, char *name);
+rr_vec2f_s mt_get_vec2_tag(MtEntity entity, char *name);
+rr_vec3f_s mt_get_vec3_tag(MtEntity entity, char *name);
+rr_vec4f_s mt_get_vec4_tag(MtEntity entity, char *name);
 
 MtTask mt_create_task(MtState state, MtTaskCreationInfo creation_info);
 void mt_delete_task(MtTask task);