ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.

All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()

16 files changed, 383 insertions, 383 deletions

diff --git a/modules/visual_script/register_types.cpp b/modules/visual_script/register_types.cpp
index 793cc7288..79bf3d50b 100644
--- a/modules/visual_script/register_types.cpp
+++ b/modules/visual_script/register_types.cpp
@@ -48,58 +48,58 @@ void register_visual_script_types() {
 	//script_language_gd->init();
 	ScriptServer::register_language(visual_script_language);
 
-	ObjectTypeDB::register_type<VisualScript>();
-	ObjectTypeDB::register_virtual_type<VisualScriptNode>();
-	ObjectTypeDB::register_virtual_type<VisualScriptFunctionState>();
-	ObjectTypeDB::register_type<VisualScriptFunction>();
-	ObjectTypeDB::register_type<VisualScriptOperator>();
-	ObjectTypeDB::register_type<VisualScriptVariableSet>();
-	ObjectTypeDB::register_type<VisualScriptVariableGet>();
-	ObjectTypeDB::register_type<VisualScriptConstant>();
-	ObjectTypeDB::register_type<VisualScriptIndexGet>();
-	ObjectTypeDB::register_type<VisualScriptIndexSet>();
-	ObjectTypeDB::register_type<VisualScriptGlobalConstant>();
-	ObjectTypeDB::register_type<VisualScriptClassConstant>();
-	ObjectTypeDB::register_type<VisualScriptMathConstant>();
-	ObjectTypeDB::register_type<VisualScriptBasicTypeConstant>();
-	ObjectTypeDB::register_type<VisualScriptEngineSingleton>();
-	ObjectTypeDB::register_type<VisualScriptSceneNode>();
-	ObjectTypeDB::register_type<VisualScriptSceneTree>();
-	ObjectTypeDB::register_type<VisualScriptResourcePath>();
-	ObjectTypeDB::register_type<VisualScriptSelf>();
-	ObjectTypeDB::register_type<VisualScriptCustomNode>();
-	ObjectTypeDB::register_type<VisualScriptSubCall>();
-	ObjectTypeDB::register_type<VisualScriptComment>();
-	ObjectTypeDB::register_type<VisualScriptConstructor>();
-	ObjectTypeDB::register_type<VisualScriptLocalVar>();
-	ObjectTypeDB::register_type<VisualScriptLocalVarSet>();
-	ObjectTypeDB::register_type<VisualScriptInputAction>();
-	ObjectTypeDB::register_type<VisualScriptDeconstruct>();
-	ObjectTypeDB::register_type<VisualScriptPreload>();
-	ObjectTypeDB::register_type<VisualScriptTypeCast>();
+	ClassDB::register_class<VisualScript>();
+	ClassDB::register_virtual_class<VisualScriptNode>();
+	ClassDB::register_virtual_class<VisualScriptFunctionState>();
+	ClassDB::register_class<VisualScriptFunction>();
+	ClassDB::register_class<VisualScriptOperator>();
+	ClassDB::register_class<VisualScriptVariableSet>();
+	ClassDB::register_class<VisualScriptVariableGet>();
+	ClassDB::register_class<VisualScriptConstant>();
+	ClassDB::register_class<VisualScriptIndexGet>();
+	ClassDB::register_class<VisualScriptIndexSet>();
+	ClassDB::register_class<VisualScriptGlobalConstant>();
+	ClassDB::register_class<VisualScriptClassConstant>();
+	ClassDB::register_class<VisualScriptMathConstant>();
+	ClassDB::register_class<VisualScriptBasicTypeConstant>();
+	ClassDB::register_class<VisualScriptEngineSingleton>();
+	ClassDB::register_class<VisualScriptSceneNode>();
+	ClassDB::register_class<VisualScriptSceneTree>();
+	ClassDB::register_class<VisualScriptResourcePath>();
+	ClassDB::register_class<VisualScriptSelf>();
+	ClassDB::register_class<VisualScriptCustomNode>();
+	ClassDB::register_class<VisualScriptSubCall>();
+	ClassDB::register_class<VisualScriptComment>();
+	ClassDB::register_class<VisualScriptConstructor>();
+	ClassDB::register_class<VisualScriptLocalVar>();
+	ClassDB::register_class<VisualScriptLocalVarSet>();
+	ClassDB::register_class<VisualScriptInputAction>();
+	ClassDB::register_class<VisualScriptDeconstruct>();
+	ClassDB::register_class<VisualScriptPreload>();
+	ClassDB::register_class<VisualScriptTypeCast>();
 
 
-	ObjectTypeDB::register_type<VisualScriptFunctionCall>();
-	ObjectTypeDB::register_type<VisualScriptPropertySet>();
-	ObjectTypeDB::register_type<VisualScriptPropertyGet>();
-//	ObjectTypeDB::register_type<VisualScriptScriptCall>();
-	ObjectTypeDB::register_type<VisualScriptEmitSignal>();
+	ClassDB::register_class<VisualScriptFunctionCall>();
+	ClassDB::register_class<VisualScriptPropertySet>();
+	ClassDB::register_class<VisualScriptPropertyGet>();
+//	ClassDB::register_type<VisualScriptScriptCall>();
+	ClassDB::register_class<VisualScriptEmitSignal>();
 
-	ObjectTypeDB::register_type<VisualScriptReturn>();
-	ObjectTypeDB::register_type<VisualScriptCondition>();
-	ObjectTypeDB::register_type<VisualScriptWhile>();
-	ObjectTypeDB::register_type<VisualScriptIterator>();
-	ObjectTypeDB::register_type<VisualScriptSequence>();
-	ObjectTypeDB::register_type<VisualScriptInputFilter>();
-	ObjectTypeDB::register_type<VisualScriptSwitch	>();
+	ClassDB::register_class<VisualScriptReturn>();
+	ClassDB::register_class<VisualScriptCondition>();
+	ClassDB::register_class<VisualScriptWhile>();
+	ClassDB::register_class<VisualScriptIterator>();
+	ClassDB::register_class<VisualScriptSequence>();
+	ClassDB::register_class<VisualScriptInputFilter>();
+	ClassDB::register_class<VisualScriptSwitch	>();
 
-	ObjectTypeDB::register_type<VisualScriptYield>();
-	ObjectTypeDB::register_type<VisualScriptYieldSignal>();
+	ClassDB::register_class<VisualScriptYield>();
+	ClassDB::register_class<VisualScriptYieldSignal>();
 
-	ObjectTypeDB::register_type<VisualScriptBuiltinFunc>();
+	ClassDB::register_class<VisualScriptBuiltinFunc>();
 
 
-	ObjectTypeDB::register_type<VisualScriptExpression>();
+	ClassDB::register_class<VisualScriptExpression>();
 
 	register_visual_script_nodes();
 	register_visual_script_func_nodes();
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index bd042c898..64b949bb6 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -104,11 +104,11 @@ Array VisualScriptNode::_get_default_input_values() const {
 
 void VisualScriptNode::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("get_visual_script:VisualScript"),&VisualScriptNode::get_visual_script);
-	ObjectTypeDB::bind_method(_MD("set_default_input_value","port_idx","value:Variant"),&VisualScriptNode::set_default_input_value);
-	ObjectTypeDB::bind_method(_MD("get_default_input_value:Variant","port_idx"),&VisualScriptNode::get_default_input_value);
-	ObjectTypeDB::bind_method(_MD("_set_default_input_values","values"),&VisualScriptNode::_set_default_input_values);
-	ObjectTypeDB::bind_method(_MD("_get_default_input_values"),&VisualScriptNode::_get_default_input_values);
+	ClassDB::bind_method(_MD("get_visual_script:VisualScript"),&VisualScriptNode::get_visual_script);
+	ClassDB::bind_method(_MD("set_default_input_value","port_idx","value:Variant"),&VisualScriptNode::set_default_input_value);
+	ClassDB::bind_method(_MD("get_default_input_value:Variant","port_idx"),&VisualScriptNode::get_default_input_value);
+	ClassDB::bind_method(_MD("_set_default_input_values","values"),&VisualScriptNode::_set_default_input_values);
+	ClassDB::bind_method(_MD("_get_default_input_values"),&VisualScriptNode::_get_default_input_values);
 
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY,"_default_input_values",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("_set_default_input_values"),_SCS("_get_default_input_values"));
 	ADD_SIGNAL(MethodInfo("ports_changed"));
@@ -122,7 +122,7 @@ VisualScriptNode::TypeGuess VisualScriptNode::guess_output_type(TypeGuess* p_inp
 
 	tg.type=pinfo.type;
 	if (pinfo.hint==PROPERTY_HINT_RESOURCE_TYPE) {
-		tg.obj_type=pinfo.hint_string;
+		tg.GDCLASS=pinfo.hint_string;
 	}
 
 	return tg;
@@ -1317,63 +1317,63 @@ void VisualScript::_bind_methods() {
 
 
 
-	ObjectTypeDB::bind_method(_MD("_node_ports_changed"),&VisualScript::_node_ports_changed);
+	ClassDB::bind_method(_MD("_node_ports_changed"),&VisualScript::_node_ports_changed);
 
-	ObjectTypeDB::bind_method(_MD("add_function","name"),&VisualScript::add_function);
-	ObjectTypeDB::bind_method(_MD("has_function","name"),&VisualScript::has_function);	
-	ObjectTypeDB::bind_method(_MD("remove_function","name"),&VisualScript::remove_function);
-	ObjectTypeDB::bind_method(_MD("rename_function","name","new_name"),&VisualScript::rename_function);
-	ObjectTypeDB::bind_method(_MD("set_function_scroll","ofs"),&VisualScript::set_function_scroll);
-	ObjectTypeDB::bind_method(_MD("get_function_scroll"),&VisualScript::get_function_scroll);
+	ClassDB::bind_method(_MD("add_function","name"),&VisualScript::add_function);
+	ClassDB::bind_method(_MD("has_function","name"),&VisualScript::has_function);	
+	ClassDB::bind_method(_MD("remove_function","name"),&VisualScript::remove_function);
+	ClassDB::bind_method(_MD("rename_function","name","new_name"),&VisualScript::rename_function);
+	ClassDB::bind_method(_MD("set_function_scroll","ofs"),&VisualScript::set_function_scroll);
+	ClassDB::bind_method(_MD("get_function_scroll"),&VisualScript::get_function_scroll);
 
-	ObjectTypeDB::bind_method(_MD("add_node","func","id","node","pos"),&VisualScript::add_node,DEFVAL(Point2()));
-	ObjectTypeDB::bind_method(_MD("remove_node","func","id"),&VisualScript::remove_node);
-	ObjectTypeDB::bind_method(_MD("get_function_node_id","name"),&VisualScript::get_function_node_id);
+	ClassDB::bind_method(_MD("add_node","func","id","node","pos"),&VisualScript::add_node,DEFVAL(Point2()));
+	ClassDB::bind_method(_MD("remove_node","func","id"),&VisualScript::remove_node);
+	ClassDB::bind_method(_MD("get_function_node_id","name"),&VisualScript::get_function_node_id);
 
-	ObjectTypeDB::bind_method(_MD("get_node","func","id"),&VisualScript::get_node);
-	ObjectTypeDB::bind_method(_MD("has_node","func","id"),&VisualScript::has_node);
-	ObjectTypeDB::bind_method(_MD("set_node_pos","func","id","pos"),&VisualScript::set_node_pos);
-	ObjectTypeDB::bind_method(_MD("get_node_pos","func","id"),&VisualScript::get_node_pos);
+	ClassDB::bind_method(_MD("get_node","func","id"),&VisualScript::get_node);
+	ClassDB::bind_method(_MD("has_node","func","id"),&VisualScript::has_node);
+	ClassDB::bind_method(_MD("set_node_pos","func","id","pos"),&VisualScript::set_node_pos);
+	ClassDB::bind_method(_MD("get_node_pos","func","id"),&VisualScript::get_node_pos);
 
-	ObjectTypeDB::bind_method(_MD("sequence_connect","func","from_node","from_output","to_node"),&VisualScript::sequence_connect);
-	ObjectTypeDB::bind_method(_MD("sequence_disconnect","func","from_node","from_output","to_node"),&VisualScript::sequence_disconnect);
-	ObjectTypeDB::bind_method(_MD("has_sequence_connection","func","from_node","from_output","to_node"),&VisualScript::has_sequence_connection);
+	ClassDB::bind_method(_MD("sequence_connect","func","from_node","from_output","to_node"),&VisualScript::sequence_connect);
+	ClassDB::bind_method(_MD("sequence_disconnect","func","from_node","from_output","to_node"),&VisualScript::sequence_disconnect);
+	ClassDB::bind_method(_MD("has_sequence_connection","func","from_node","from_output","to_node"),&VisualScript::has_sequence_connection);
 
-	ObjectTypeDB::bind_method(_MD("data_connect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_connect);
-	ObjectTypeDB::bind_method(_MD("data_disconnect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_disconnect);
-	ObjectTypeDB::bind_method(_MD("has_data_connection","func","from_node","from_port","to_node","to_port"),&VisualScript::has_data_connection);
+	ClassDB::bind_method(_MD("data_connect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_connect);
+	ClassDB::bind_method(_MD("data_disconnect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_disconnect);
+	ClassDB::bind_method(_MD("has_data_connection","func","from_node","from_port","to_node","to_port"),&VisualScript::has_data_connection);
 
-	ObjectTypeDB::bind_method(_MD("add_variable","name","default_value","export"),&VisualScript::add_variable,DEFVAL(Variant()),DEFVAL(false));
-	ObjectTypeDB::bind_method(_MD("has_variable","name"),&VisualScript::has_variable);
-	ObjectTypeDB::bind_method(_MD("remove_variable","name"),&VisualScript::remove_variable);
-	ObjectTypeDB::bind_method(_MD("set_variable_default_value","name","value"),&VisualScript::set_variable_default_value);
-	ObjectTypeDB::bind_method(_MD("get_variable_default_value","name"),&VisualScript::get_variable_default_value);
-	ObjectTypeDB::bind_method(_MD("set_variable_info","name","value"),&VisualScript::_set_variable_info);
-	ObjectTypeDB::bind_method(_MD("get_variable_info","name"),&VisualScript::_get_variable_info);
-	ObjectTypeDB::bind_method(_MD("set_variable_export","name","enable"),&VisualScript::set_variable_export);
-	ObjectTypeDB::bind_method(_MD("get_variable_export","name"),&VisualScript::get_variable_export);
-	ObjectTypeDB::bind_method(_MD("rename_variable","name","new_name"),&VisualScript::rename_variable);
+	ClassDB::bind_method(_MD("add_variable","name","default_value","export"),&VisualScript::add_variable,DEFVAL(Variant()),DEFVAL(false));
+	ClassDB::bind_method(_MD("has_variable","name"),&VisualScript::has_variable);
+	ClassDB::bind_method(_MD("remove_variable","name"),&VisualScript::remove_variable);
+	ClassDB::bind_method(_MD("set_variable_default_value","name","value"),&VisualScript::set_variable_default_value);
+	ClassDB::bind_method(_MD("get_variable_default_value","name"),&VisualScript::get_variable_default_value);
+	ClassDB::bind_method(_MD("set_variable_info","name","value"),&VisualScript::_set_variable_info);
+	ClassDB::bind_method(_MD("get_variable_info","name"),&VisualScript::_get_variable_info);
+	ClassDB::bind_method(_MD("set_variable_export","name","enable"),&VisualScript::set_variable_export);
+	ClassDB::bind_method(_MD("get_variable_export","name"),&VisualScript::get_variable_export);
+	ClassDB::bind_method(_MD("rename_variable","name","new_name"),&VisualScript::rename_variable);
 
-	ObjectTypeDB::bind_method(_MD("add_custom_signal","name"),&VisualScript::add_custom_signal);
-	ObjectTypeDB::bind_method(_MD("has_custom_signal","name"),&VisualScript::has_custom_signal);
-	ObjectTypeDB::bind_method(_MD("custom_signal_add_argument","name","type","argname","index"),&VisualScript::custom_signal_add_argument,DEFVAL(-1));
-	ObjectTypeDB::bind_method(_MD("custom_signal_set_argument_type","name","argidx","type"),&VisualScript::custom_signal_set_argument_type);
-	ObjectTypeDB::bind_method(_MD("custom_signal_get_argument_type","name","argidx"),&VisualScript::custom_signal_get_argument_type);
-	ObjectTypeDB::bind_method(_MD("custom_signal_set_argument_name","name","argidx","argname"),&VisualScript::custom_signal_set_argument_name);
-	ObjectTypeDB::bind_method(_MD("custom_signal_get_argument_name","name","argidx"),&VisualScript::custom_signal_get_argument_name);
-	ObjectTypeDB::bind_method(_MD("custom_signal_remove_argument","argidx"),&VisualScript::custom_signal_remove_argument);
-	ObjectTypeDB::bind_method(_MD("custom_signal_get_argument_count","name"),&VisualScript::custom_signal_get_argument_count);
-	ObjectTypeDB::bind_method(_MD("custom_signal_swap_argument","name","argidx","withidx"),&VisualScript::custom_signal_swap_argument);
-	ObjectTypeDB::bind_method(_MD("remove_custom_signal","name"),&VisualScript::remove_custom_signal);
-	ObjectTypeDB::bind_method(_MD("rename_custom_signal","name","new_name"),&VisualScript::rename_custom_signal);
+	ClassDB::bind_method(_MD("add_custom_signal","name"),&VisualScript::add_custom_signal);
+	ClassDB::bind_method(_MD("has_custom_signal","name"),&VisualScript::has_custom_signal);
+	ClassDB::bind_method(_MD("custom_signal_add_argument","name","type","argname","index"),&VisualScript::custom_signal_add_argument,DEFVAL(-1));
+	ClassDB::bind_method(_MD("custom_signal_set_argument_type","name","argidx","type"),&VisualScript::custom_signal_set_argument_type);
+	ClassDB::bind_method(_MD("custom_signal_get_argument_type","name","argidx"),&VisualScript::custom_signal_get_argument_type);
+	ClassDB::bind_method(_MD("custom_signal_set_argument_name","name","argidx","argname"),&VisualScript::custom_signal_set_argument_name);
+	ClassDB::bind_method(_MD("custom_signal_get_argument_name","name","argidx"),&VisualScript::custom_signal_get_argument_name);
+	ClassDB::bind_method(_MD("custom_signal_remove_argument","argidx"),&VisualScript::custom_signal_remove_argument);
+	ClassDB::bind_method(_MD("custom_signal_get_argument_count","name"),&VisualScript::custom_signal_get_argument_count);
+	ClassDB::bind_method(_MD("custom_signal_swap_argument","name","argidx","withidx"),&VisualScript::custom_signal_swap_argument);
+	ClassDB::bind_method(_MD("remove_custom_signal","name"),&VisualScript::remove_custom_signal);
+	ClassDB::bind_method(_MD("rename_custom_signal","name","new_name"),&VisualScript::rename_custom_signal);
 
-	//ObjectTypeDB::bind_method(_MD("set_variable_info","name","info"),&VScript::set_variable_info);
-	//ObjectTypeDB::bind_method(_MD("get_variable_info","name"),&VScript::set_variable_info);
+	//ClassDB::bind_method(_MD("set_variable_info","name","info"),&VScript::set_variable_info);
+	//ClassDB::bind_method(_MD("get_variable_info","name"),&VScript::set_variable_info);
 
-	ObjectTypeDB::bind_method(_MD("set_instance_base_type","type"),&VisualScript::set_instance_base_type);
+	ClassDB::bind_method(_MD("set_instance_base_type","type"),&VisualScript::set_instance_base_type);
 
-	ObjectTypeDB::bind_method(_MD("_set_data","data"),&VisualScript::_set_data);
-	ObjectTypeDB::bind_method(_MD("_get_data"),&VisualScript::_get_data);
+	ClassDB::bind_method(_MD("_set_data","data"),&VisualScript::_set_data);
+	ClassDB::bind_method(_MD("_get_data"),&VisualScript::_get_data);
 
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("_set_data"),_SCS("_get_data"));
 
@@ -1573,7 +1573,7 @@ Variant VisualScriptInstance::_call_internal(const StringName& p_method, void* p
 		p_pass++; //increment pass
 		current_node_id=node->get_id();
 
-		VSDEBUG("==========AT NODE: "+itos(current_node_id)+" base: "+node->get_base_node()->get_type());
+		VSDEBUG("==========AT NODE: "+itos(current_node_id)+" base: "+node->get_base_node()->get_class_name());
 		VSDEBUG("AT STACK POS: "+itos(flow_stack_pos));
 
 
@@ -2436,10 +2436,10 @@ Variant VisualScriptFunctionState::resume(Array p_args) {
 
 void VisualScriptFunctionState::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("connect_to_signal","obj","signals","args"),&VisualScriptFunctionState::connect_to_signal);
-	ObjectTypeDB::bind_method(_MD("resume:Array","args"),&VisualScriptFunctionState::resume,DEFVAL(Variant()));
-	ObjectTypeDB::bind_method(_MD("is_valid"),&VisualScriptFunctionState::is_valid);
-	ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&VisualScriptFunctionState::_signal_callback,MethodInfo("_signal_callback"));
+	ClassDB::bind_method(_MD("connect_to_signal","obj","signals","args"),&VisualScriptFunctionState::connect_to_signal);
+	ClassDB::bind_method(_MD("resume:Array","args"),&VisualScriptFunctionState::resume,DEFVAL(Variant()));
+	ClassDB::bind_method(_MD("is_valid"),&VisualScriptFunctionState::is_valid);
+	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&VisualScriptFunctionState::_signal_callback,MethodInfo("_signal_callback"));
 }
 
 VisualScriptFunctionState::VisualScriptFunctionState() {
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index 63b018b0c..340db21c3 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -9,7 +9,7 @@ class VisualScriptNodeInstance;
 class VisualScript;
 
 class VisualScriptNode : public Resource {
-	OBJ_TYPE(VisualScriptNode,Resource)
+	GDCLASS(VisualScriptNode,Resource)
 
 friend class VisualScript;
 
@@ -64,7 +64,7 @@ public:
 
 		Variant::Type type;
 		InputEvent::Type ev_type;
-		StringName obj_type;
+		StringName GDCLASS;
 		Ref<Script> script;
 
 		TypeGuess() { type=Variant::NIL; ev_type=InputEvent::NONE; }
@@ -143,7 +143,7 @@ public:
 
 class VisualScript : public Script {
 
-	OBJ_TYPE( VisualScript, Script )
+	GDCLASS( VisualScript, Script )
 
 	RES_BASE_EXTENSION("vs");
 
@@ -437,7 +437,7 @@ public:
 
 class VisualScriptFunctionState : public Reference {
 
-	OBJ_TYPE(VisualScriptFunctionState,Reference);
+	GDCLASS(VisualScriptFunctionState,Reference);
 friend class VisualScriptInstance;
 
 	ObjectID instance_id;
diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp
index 2bfb6bc9e..58dbfbc5a 100644
--- a/modules/visual_script/visual_script_builtin_funcs.cpp
+++ b/modules/visual_script/visual_script_builtin_funcs.cpp
@@ -981,7 +981,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func,const Variant** p_inp
 		case VisualScriptBuiltinFunc::TYPE_EXISTS: {
 
 
-			*r_return = ObjectTypeDB::type_exists(*p_inputs[0]);
+			*r_return = ClassDB::class_exists(*p_inputs[0]);
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_CHAR: {
@@ -1145,8 +1145,8 @@ VisualScriptNodeInstance* VisualScriptBuiltinFunc::instance(VisualScriptInstance
 
 void VisualScriptBuiltinFunc::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_func","which"),&VisualScriptBuiltinFunc::set_func);
-	ObjectTypeDB::bind_method(_MD("get_func"),&VisualScriptBuiltinFunc::get_func);
+	ClassDB::bind_method(_MD("set_func","which"),&VisualScriptBuiltinFunc::set_func);
+	ClassDB::bind_method(_MD("get_func"),&VisualScriptBuiltinFunc::get_func);
 
 	String cc;
 
diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h
index 8b0d70c1e..fba209959 100644
--- a/modules/visual_script/visual_script_builtin_funcs.h
+++ b/modules/visual_script/visual_script_builtin_funcs.h
@@ -6,7 +6,7 @@
 
 class VisualScriptBuiltinFunc : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptBuiltinFunc,VisualScriptNode)
+	GDCLASS(VisualScriptBuiltinFunc,VisualScriptNode)
 public:
 
 	enum BuiltinFunc {
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 02d3c453c..f9285fcf6 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -11,7 +11,7 @@
 #ifdef TOOLS_ENABLED
 class VisualScriptEditorSignalEdit : public Object {
 
-	OBJ_TYPE(VisualScriptEditorSignalEdit,Object)
+	GDCLASS(VisualScriptEditorSignalEdit,Object)
 
 	StringName sig;
 public:
@@ -22,7 +22,7 @@ public:
 protected:
 
 	static void _bind_methods() {
-		ObjectTypeDB::bind_method("_sig_changed",&VisualScriptEditorSignalEdit::_sig_changed);
+		ClassDB::bind_method("_sig_changed",&VisualScriptEditorSignalEdit::_sig_changed);
 	}
 
 	void _sig_changed() {
@@ -160,7 +160,7 @@ public:
 
 class VisualScriptEditorVariableEdit : public Object {
 
-	OBJ_TYPE(VisualScriptEditorVariableEdit,Object)
+	GDCLASS(VisualScriptEditorVariableEdit,Object)
 
 	StringName var;
 public:
@@ -171,8 +171,8 @@ public:
 protected:
 
 	static void _bind_methods() {
-		ObjectTypeDB::bind_method("_var_changed",&VisualScriptEditorVariableEdit::_var_changed);
-		ObjectTypeDB::bind_method("_var_value_changed",&VisualScriptEditorVariableEdit::_var_value_changed);
+		ClassDB::bind_method("_var_changed",&VisualScriptEditorVariableEdit::_var_changed);
+		ClassDB::bind_method("_var_value_changed",&VisualScriptEditorVariableEdit::_var_value_changed);
 	}
 
 	void _var_changed() {
@@ -990,7 +990,7 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
 				virtuals_in_menu.clear();
 
 				List<MethodInfo> mi;
-				ObjectTypeDB::get_method_list(script->get_instance_base_type(),&mi);
+				ClassDB::get_method_list(script->get_instance_base_type(),&mi);
 				for (List<MethodInfo>::Element *E=mi.front();E;E=E->next()) {
 					MethodInfo mi=E->get();
 					if (mi.flags&METHOD_FLAG_VIRTUAL) {
@@ -1917,7 +1917,7 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 					call.instance();
 					call->set_call_mode(VisualScriptFunctionCall::CALL_MODE_NODE_PATH);
 					call->set_base_path(sn->get_path_to(node));;
-					call->set_base_type(node->get_type());
+					call->set_base_type(node->get_class());
 					n=call;
 
 					method_select->select_method_from_instance(node);
@@ -1986,7 +1986,7 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 					Ref<VisualScriptPropertySet> pset;
 					pset.instance();
 					pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_INSTANCE);
-					pset->set_base_type(obj->get_type());
+					pset->set_base_type(obj->get_class());
 					/*if (use_value) {
 						pset->set_use_builtin_value(true);
 						pset->set_builtin_value(d["value"]);
@@ -1997,7 +1997,7 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 					Ref<VisualScriptPropertyGet> pget;
 					pget.instance();
 					pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_INSTANCE);
-					pget->set_base_type(obj->get_type());
+					pget->set_base_type(obj->get_class());
 
 					vnode=pget;
 
@@ -2171,7 +2171,7 @@ String VisualScriptEditor::get_name(){
 	} else if (script->get_name()!="")
 		name=script->get_name();
 	else
-		name=script->get_type()+"("+itos(script->get_instance_ID())+")";
+		name=script->get_class()+"("+itos(script->get_instance_ID())+")";
 
 	return name;
 
@@ -2704,7 +2704,7 @@ VisualScriptNode::TypeGuess  VisualScriptEditor::_guess_output_type(int p_node,i
 					if (obj) {
 
 						g.type=Variant::OBJECT;
-						g.obj_type=obj->get_type();
+						g.GDCLASS=obj->get_class();
 						g.script=obj->get_script();
 					}
 				}
@@ -2745,8 +2745,8 @@ void VisualScriptEditor::_port_action_menu(int p_option) {
 			if (tg.type==Variant::OBJECT) {
 				n->set_call_mode(VisualScriptFunctionCall::CALL_MODE_INSTANCE);
 
-				if (tg.obj_type!=StringName()) {
-					n->set_base_type(tg.obj_type);
+				if (tg.GDCLASS!=StringName()) {
+					n->set_base_type(tg.GDCLASS);
 				} else {
 					n->set_base_type("Object");
 				}
@@ -2780,8 +2780,8 @@ void VisualScriptEditor::_port_action_menu(int p_option) {
 			if (tg.type==Variant::OBJECT) {
 				n->set_call_mode(VisualScriptPropertySet::CALL_MODE_INSTANCE);
 
-				if (tg.obj_type!=StringName()) {
-					n->set_base_type(tg.obj_type);
+				if (tg.GDCLASS!=StringName()) {
+					n->set_base_type(tg.GDCLASS);
 				} else {
 					n->set_base_type("Object");
 				}
@@ -2811,8 +2811,8 @@ void VisualScriptEditor::_port_action_menu(int p_option) {
 			if (tg.type==Variant::OBJECT) {
 				n->set_call_mode(VisualScriptPropertyGet::CALL_MODE_INSTANCE);
 
-				if (tg.obj_type!=StringName()) {
-					n->set_base_type(tg.obj_type);
+				if (tg.GDCLASS!=StringName()) {
+					n->set_base_type(tg.GDCLASS);
 				} else {
 					n->set_base_type("Object");
 				}
@@ -3232,55 +3232,55 @@ void VisualScriptEditor::_menu_option(int p_what) {
 
 void VisualScriptEditor::_bind_methods() {
 
-	ObjectTypeDB::bind_method("_member_button",&VisualScriptEditor::_member_button);
-	ObjectTypeDB::bind_method("_member_edited",&VisualScriptEditor::_member_edited);
-	ObjectTypeDB::bind_method("_member_selected",&VisualScriptEditor::_member_selected);
-	ObjectTypeDB::bind_method("_update_members",&VisualScriptEditor::_update_members);
-	ObjectTypeDB::bind_method("_change_base_type",&VisualScriptEditor::_change_base_type);
-	ObjectTypeDB::bind_method("_change_base_type_callback",&VisualScriptEditor::_change_base_type_callback);
-	ObjectTypeDB::bind_method("_override_pressed",&VisualScriptEditor::_override_pressed);
-	ObjectTypeDB::bind_method("_node_selected",&VisualScriptEditor::_node_selected);
-	ObjectTypeDB::bind_method("_node_moved",&VisualScriptEditor::_node_moved);
-	ObjectTypeDB::bind_method("_move_node",&VisualScriptEditor::_move_node);
-	ObjectTypeDB::bind_method("_begin_node_move",&VisualScriptEditor::_begin_node_move);
-	ObjectTypeDB::bind_method("_end_node_move",&VisualScriptEditor::_end_node_move);
-	ObjectTypeDB::bind_method("_remove_node",&VisualScriptEditor::_remove_node);
-	ObjectTypeDB::bind_method("_update_graph",&VisualScriptEditor::_update_graph,DEFVAL(-1));
-	ObjectTypeDB::bind_method("_node_ports_changed",&VisualScriptEditor::_node_ports_changed);
-	ObjectTypeDB::bind_method("_available_node_doubleclicked",&VisualScriptEditor::_available_node_doubleclicked);
-	ObjectTypeDB::bind_method("_default_value_edited",&VisualScriptEditor::_default_value_edited);
-	ObjectTypeDB::bind_method("_default_value_changed",&VisualScriptEditor::_default_value_changed);
-	ObjectTypeDB::bind_method("_menu_option",&VisualScriptEditor::_menu_option);
-	ObjectTypeDB::bind_method("_graph_ofs_changed",&VisualScriptEditor::_graph_ofs_changed);
-	ObjectTypeDB::bind_method("_center_on_node",&VisualScriptEditor::_center_on_node);
-	ObjectTypeDB::bind_method("_comment_node_resized",&VisualScriptEditor::_comment_node_resized);
-	ObjectTypeDB::bind_method("_button_resource_previewed",&VisualScriptEditor::_button_resource_previewed);
-	ObjectTypeDB::bind_method("_port_action_menu",&VisualScriptEditor::_port_action_menu);
-	ObjectTypeDB::bind_method("_selected_connect_node_method_or_setget",&VisualScriptEditor::_selected_connect_node_method_or_setget);
-	ObjectTypeDB::bind_method("_expression_text_changed",&VisualScriptEditor::_expression_text_changed);
+	ClassDB::bind_method("_member_button",&VisualScriptEditor::_member_button);
+	ClassDB::bind_method("_member_edited",&VisualScriptEditor::_member_edited);
+	ClassDB::bind_method("_member_selected",&VisualScriptEditor::_member_selected);
+	ClassDB::bind_method("_update_members",&VisualScriptEditor::_update_members);
+	ClassDB::bind_method("_change_base_type",&VisualScriptEditor::_change_base_type);
+	ClassDB::bind_method("_change_base_type_callback",&VisualScriptEditor::_change_base_type_callback);
+	ClassDB::bind_method("_override_pressed",&VisualScriptEditor::_override_pressed);
+	ClassDB::bind_method("_node_selected",&VisualScriptEditor::_node_selected);
+	ClassDB::bind_method("_node_moved",&VisualScriptEditor::_node_moved);
+	ClassDB::bind_method("_move_node",&VisualScriptEditor::_move_node);
+	ClassDB::bind_method("_begin_node_move",&VisualScriptEditor::_begin_node_move);
+	ClassDB::bind_method("_end_node_move",&VisualScriptEditor::_end_node_move);
+	ClassDB::bind_method("_remove_node",&VisualScriptEditor::_remove_node);
+	ClassDB::bind_method("_update_graph",&VisualScriptEditor::_update_graph,DEFVAL(-1));
+	ClassDB::bind_method("_node_ports_changed",&VisualScriptEditor::_node_ports_changed);
+	ClassDB::bind_method("_available_node_doubleclicked",&VisualScriptEditor::_available_node_doubleclicked);
+	ClassDB::bind_method("_default_value_edited",&VisualScriptEditor::_default_value_edited);
+	ClassDB::bind_method("_default_value_changed",&VisualScriptEditor::_default_value_changed);
+	ClassDB::bind_method("_menu_option",&VisualScriptEditor::_menu_option);
+	ClassDB::bind_method("_graph_ofs_changed",&VisualScriptEditor::_graph_ofs_changed);
+	ClassDB::bind_method("_center_on_node",&VisualScriptEditor::_center_on_node);
+	ClassDB::bind_method("_comment_node_resized",&VisualScriptEditor::_comment_node_resized);
+	ClassDB::bind_method("_button_resource_previewed",&VisualScriptEditor::_button_resource_previewed);
+	ClassDB::bind_method("_port_action_menu",&VisualScriptEditor::_port_action_menu);
+	ClassDB::bind_method("_selected_connect_node_method_or_setget",&VisualScriptEditor::_selected_connect_node_method_or_setget);
+	ClassDB::bind_method("_expression_text_changed",&VisualScriptEditor::_expression_text_changed);
 
 
 
 
-	ObjectTypeDB::bind_method("get_drag_data_fw",&VisualScriptEditor::get_drag_data_fw);
-	ObjectTypeDB::bind_method("can_drop_data_fw",&VisualScriptEditor::can_drop_data_fw);
-	ObjectTypeDB::bind_method("drop_data_fw",&VisualScriptEditor::drop_data_fw);
+	ClassDB::bind_method("get_drag_data_fw",&VisualScriptEditor::get_drag_data_fw);
+	ClassDB::bind_method("can_drop_data_fw",&VisualScriptEditor::can_drop_data_fw);
+	ClassDB::bind_method("drop_data_fw",&VisualScriptEditor::drop_data_fw);
 
-	ObjectTypeDB::bind_method("_input",&VisualScriptEditor::_input);
-	ObjectTypeDB::bind_method("_on_nodes_delete",&VisualScriptEditor::_on_nodes_delete);
-	ObjectTypeDB::bind_method("_on_nodes_duplicate",&VisualScriptEditor::_on_nodes_duplicate);
+	ClassDB::bind_method("_input",&VisualScriptEditor::_input);
+	ClassDB::bind_method("_on_nodes_delete",&VisualScriptEditor::_on_nodes_delete);
+	ClassDB::bind_method("_on_nodes_duplicate",&VisualScriptEditor::_on_nodes_duplicate);
 
-	ObjectTypeDB::bind_method("_hide_timer",&VisualScriptEditor::_hide_timer);
+	ClassDB::bind_method("_hide_timer",&VisualScriptEditor::_hide_timer);
 
-	ObjectTypeDB::bind_method("_graph_connected",&VisualScriptEditor::_graph_connected);
-	ObjectTypeDB::bind_method("_graph_disconnected",&VisualScriptEditor::_graph_disconnected);
-	ObjectTypeDB::bind_method("_graph_connect_to_empty",&VisualScriptEditor::_graph_connect_to_empty);
+	ClassDB::bind_method("_graph_connected",&VisualScriptEditor::_graph_connected);
+	ClassDB::bind_method("_graph_disconnected",&VisualScriptEditor::_graph_disconnected);
+	ClassDB::bind_method("_graph_connect_to_empty",&VisualScriptEditor::_graph_connect_to_empty);
 
-	ObjectTypeDB::bind_method("_update_graph_connections",&VisualScriptEditor::_update_graph_connections);
-	ObjectTypeDB::bind_method("_node_filter_changed",&VisualScriptEditor::_node_filter_changed);
+	ClassDB::bind_method("_update_graph_connections",&VisualScriptEditor::_update_graph_connections);
+	ClassDB::bind_method("_node_filter_changed",&VisualScriptEditor::_node_filter_changed);
 
-	ObjectTypeDB::bind_method("_selected_method",&VisualScriptEditor::_selected_method);
-	ObjectTypeDB::bind_method("_draw_color_over_button",&VisualScriptEditor::_draw_color_over_button);
+	ClassDB::bind_method("_selected_method",&VisualScriptEditor::_selected_method);
+	ClassDB::bind_method("_draw_color_over_button",&VisualScriptEditor::_draw_color_over_button);
 
 
 
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index 483ae1644..dbd5d220c 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -15,7 +15,7 @@ class VisualScriptEditorVariableEdit;
 
 
 class VisualScriptEditor : public ScriptEditorBase {
-	OBJ_TYPE(VisualScriptEditor,ScriptEditorBase)
+	GDCLASS(VisualScriptEditor,ScriptEditorBase)
 
 	enum {
 		TYPE_SEQUENCE=1000,
diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h
index 4edae133c..a67656a4b 100644
--- a/modules/visual_script/visual_script_expression.h
+++ b/modules/visual_script/visual_script_expression.h
@@ -6,7 +6,7 @@
 
 class VisualScriptExpression : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptExpression,VisualScriptNode)
+	GDCLASS(VisualScriptExpression,VisualScriptNode)
 friend class VisualScriptNodeInstanceExpression;
 
 	struct Input {
diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp
index 97338da18..606a2f47a 100644
--- a/modules/visual_script/visual_script_flow_control.cpp
+++ b/modules/visual_script/visual_script_flow_control.cpp
@@ -81,10 +81,10 @@ bool VisualScriptReturn::is_return_value_enabled() const {
 
 void VisualScriptReturn::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_return_type","type"),&VisualScriptReturn::set_return_type);
-	ObjectTypeDB::bind_method(_MD("get_return_type"),&VisualScriptReturn::get_return_type);
-	ObjectTypeDB::bind_method(_MD("set_enable_return_value","enable"),&VisualScriptReturn::set_enable_return_value);
-	ObjectTypeDB::bind_method(_MD("is_return_value_enabled"),&VisualScriptReturn::is_return_value_enabled);
+	ClassDB::bind_method(_MD("set_return_type","type"),&VisualScriptReturn::set_return_type);
+	ClassDB::bind_method(_MD("get_return_type"),&VisualScriptReturn::get_return_type);
+	ClassDB::bind_method(_MD("set_enable_return_value","enable"),&VisualScriptReturn::set_enable_return_value);
+	ClassDB::bind_method(_MD("is_return_value_enabled"),&VisualScriptReturn::is_return_value_enabled);
 
 	String argt="Any";
 	for(int i=1;i<Variant::VARIANT_MAX;i++) {
@@ -544,8 +544,8 @@ int VisualScriptSequence::get_steps() const {
 
 void VisualScriptSequence::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_steps","steps"),&VisualScriptSequence::set_steps);
-	ObjectTypeDB::bind_method(_MD("get_steps"),&VisualScriptSequence::get_steps);
+	ClassDB::bind_method(_MD("set_steps","steps"),&VisualScriptSequence::set_steps);
+	ClassDB::bind_method(_MD("get_steps"),&VisualScriptSequence::get_steps);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT,"steps",PROPERTY_HINT_RANGE,"1,64,1"),_SCS("set_steps"),_SCS("get_steps"));
 
@@ -1869,7 +1869,7 @@ public:
 			return 1; //not found sorry
 		}
 
-		if (ObjectTypeDB::is_type(obj->get_type_name(),base_type)) {
+		if (ClassDB::is_parent_class(obj->get_class_name(),base_type)) {
 			*p_outputs[0]=*p_inputs[0]; //copy
 			return 0;
 		} else
@@ -1893,11 +1893,11 @@ VisualScriptNodeInstance* VisualScriptTypeCast::instance(VisualScriptInstance* p
 
 void VisualScriptTypeCast::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","type"),&VisualScriptTypeCast::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptTypeCast::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","type"),&VisualScriptTypeCast::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptTypeCast::get_base_type);
 
-	ObjectTypeDB::bind_method(_MD("set_base_script","path"),&VisualScriptTypeCast::set_base_script);
-	ObjectTypeDB::bind_method(_MD("get_base_script"),&VisualScriptTypeCast::get_base_script);
+	ClassDB::bind_method(_MD("set_base_script","path"),&VisualScriptTypeCast::set_base_script);
+	ClassDB::bind_method(_MD("get_base_script"),&VisualScriptTypeCast::get_base_script);
 
 
 	List<String> script_extensions;
diff --git a/modules/visual_script/visual_script_flow_control.h b/modules/visual_script/visual_script_flow_control.h
index e0da84a53..26e981cb1 100644
--- a/modules/visual_script/visual_script_flow_control.h
+++ b/modules/visual_script/visual_script_flow_control.h
@@ -5,7 +5,7 @@
 
 class VisualScriptReturn : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptReturn,VisualScriptNode)
+	GDCLASS(VisualScriptReturn,VisualScriptNode)
 
 
 	Variant::Type type;
@@ -48,7 +48,7 @@ public:
 
 class VisualScriptCondition : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptCondition,VisualScriptNode)
+	GDCLASS(VisualScriptCondition,VisualScriptNode)
 
 
 
@@ -84,7 +84,7 @@ public:
 
 class VisualScriptWhile : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptWhile,VisualScriptNode)
+	GDCLASS(VisualScriptWhile,VisualScriptNode)
 
 
 
@@ -121,7 +121,7 @@ public:
 
 class VisualScriptIterator : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptIterator,VisualScriptNode)
+	GDCLASS(VisualScriptIterator,VisualScriptNode)
 
 
 
@@ -158,7 +158,7 @@ public:
 
 class VisualScriptSequence : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSequence,VisualScriptNode)
+	GDCLASS(VisualScriptSequence,VisualScriptNode)
 
 
 	int steps;
@@ -199,7 +199,7 @@ public:
 
 class VisualScriptSwitch : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSwitch,VisualScriptNode)
+	GDCLASS(VisualScriptSwitch,VisualScriptNode)
 
 	struct Case {
 		Variant::Type type;
@@ -248,7 +248,7 @@ public:
 
 class VisualScriptInputFilter : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptInputFilter,VisualScriptNode)
+	GDCLASS(VisualScriptInputFilter,VisualScriptNode)
 
 	Vector<InputEvent> filters;
 
@@ -290,7 +290,7 @@ public:
 
 class VisualScriptTypeCast : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptTypeCast,VisualScriptNode)
+	GDCLASS(VisualScriptTypeCast,VisualScriptNode)
 
 
 	StringName base_type;
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index 5a21cb40e..f1424af2f 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -92,7 +92,7 @@ StringName VisualScriptFunctionCall::_get_base_type() const {
 	else if (call_mode==CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
 		if (path)
-			return path->get_type();
+			return path->get_class();
 
 	}
 
@@ -110,7 +110,7 @@ int VisualScriptFunctionCall::get_input_value_port_count() const{
 
 	} else {
 
-		MethodBind *mb = ObjectTypeDB::get_method(_get_base_type(),function);
+		MethodBind *mb = ClassDB::get_method(_get_base_type(),function);
 		if (mb) {
 			return mb->get_argument_count() + (call_mode==CALL_MODE_INSTANCE?1:0) + (rpc_call_mode>=RPC_RELIABLE_TO_ID?1:0) - use_default_args;
 		}
@@ -129,7 +129,7 @@ int VisualScriptFunctionCall::get_output_value_port_count() const{
 
 	} else {
 		int ret;
-		MethodBind *mb = ObjectTypeDB::get_method(_get_base_type(),function);
+		MethodBind *mb = ClassDB::get_method(_get_base_type(),function);
 		if (mb) {
 			ret = mb->has_return() ? 1 : 0;
 		} else
@@ -182,7 +182,7 @@ PropertyInfo VisualScriptFunctionCall::get_input_value_port_info(int p_idx) cons
 
 	} else {
 
-		MethodBind *mb = ObjectTypeDB::get_method(_get_base_type(),function);
+		MethodBind *mb = ClassDB::get_method(_get_base_type(),function);
 		if (mb) {
 			return mb->get_argument_info(p_idx);
 		}
@@ -220,7 +220,7 @@ PropertyInfo VisualScriptFunctionCall::get_output_value_port_info(int p_idx) con
 
 		PropertyInfo ret;
 
-		/*MethodBind *mb = ObjectTypeDB::get_method(_get_base_type(),function);
+		/*MethodBind *mb = ClassDB::get_method(_get_base_type(),function);
 		if (mb) {
 
 			ret = mb->get_argument_info(-1);
@@ -334,7 +334,7 @@ void VisualScriptFunctionCall::set_singleton(const StringName& p_path) {
 	singleton=p_path;
 	Object *obj = Globals::get_singleton()->get_singleton_object(singleton);
 	if (obj) {
-		base_type=obj->get_type();
+		base_type=obj->get_class();
 	}
 
 	_change_notify();
@@ -356,7 +356,7 @@ void VisualScriptFunctionCall::_update_method_cache() {
 
 		Node* node=_get_base_node();
 		if (node) {
-			type=node->get_type();
+			type=node->get_class();
 			base_type=type; //cache, too
 			script = node->get_script();
 		}
@@ -372,7 +372,7 @@ void VisualScriptFunctionCall::_update_method_cache() {
 
 		Object *obj = Globals::get_singleton()->get_singleton_object(singleton);
 		if (obj) {
-			type=obj->get_type();
+			type=obj->get_class();
 			script=obj->get_script();
 		}
 
@@ -397,7 +397,7 @@ void VisualScriptFunctionCall::_update_method_cache() {
 
 
 //		print_line("BASE: "+String(type)+" FUNC: "+String(function));
-	MethodBind *mb = ObjectTypeDB::get_method(type,function);
+	MethodBind *mb = ClassDB::get_method(type,function);
 	if (mb) {
 		use_default_args=mb->get_default_argument_count();
 		method_cache = MethodInfo();
@@ -661,7 +661,7 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo& property) const
 
 			mc = Variant::get_method_default_arguments(basic_type,function).size();
 		} else {
-			MethodBind *mb = ObjectTypeDB::get_method(_get_base_type(),function);
+			MethodBind *mb = ClassDB::get_method(_get_base_type(),function);
 			if (mb) {
 
 				mc=mb->get_default_argument_count();
@@ -687,38 +687,38 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo& property) const
 
 void VisualScriptFunctionCall::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptFunctionCall::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptFunctionCall::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptFunctionCall::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptFunctionCall::get_base_type);
 
-	ObjectTypeDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptFunctionCall::set_base_script);
-	ObjectTypeDB::bind_method(_MD("get_base_script"),&VisualScriptFunctionCall::get_base_script);
+	ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptFunctionCall::set_base_script);
+	ClassDB::bind_method(_MD("get_base_script"),&VisualScriptFunctionCall::get_base_script);
 
-	ObjectTypeDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptFunctionCall::set_basic_type);
-	ObjectTypeDB::bind_method(_MD("get_basic_type"),&VisualScriptFunctionCall::get_basic_type);
+	ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptFunctionCall::set_basic_type);
+	ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptFunctionCall::get_basic_type);
 
-	ObjectTypeDB::bind_method(_MD("set_singleton","singleton"),&VisualScriptFunctionCall::set_singleton);
-	ObjectTypeDB::bind_method(_MD("get_singleton"),&VisualScriptFunctionCall::get_singleton);
+	ClassDB::bind_method(_MD("set_singleton","singleton"),&VisualScriptFunctionCall::set_singleton);
+	ClassDB::bind_method(_MD("get_singleton"),&VisualScriptFunctionCall::get_singleton);
 
-	ObjectTypeDB::bind_method(_MD("set_function","function"),&VisualScriptFunctionCall::set_function);
-	ObjectTypeDB::bind_method(_MD("get_function"),&VisualScriptFunctionCall::get_function);
+	ClassDB::bind_method(_MD("set_function","function"),&VisualScriptFunctionCall::set_function);
+	ClassDB::bind_method(_MD("get_function"),&VisualScriptFunctionCall::get_function);
 
-	ObjectTypeDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptFunctionCall::set_call_mode);
-	ObjectTypeDB::bind_method(_MD("get_call_mode"),&VisualScriptFunctionCall::get_call_mode);
+	ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptFunctionCall::set_call_mode);
+	ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptFunctionCall::get_call_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptFunctionCall::set_base_path);
-	ObjectTypeDB::bind_method(_MD("get_base_path"),&VisualScriptFunctionCall::get_base_path);
+	ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptFunctionCall::set_base_path);
+	ClassDB::bind_method(_MD("get_base_path"),&VisualScriptFunctionCall::get_base_path);
 
-	ObjectTypeDB::bind_method(_MD("set_use_default_args","amount"),&VisualScriptFunctionCall::set_use_default_args);
-	ObjectTypeDB::bind_method(_MD("get_use_default_args"),&VisualScriptFunctionCall::get_use_default_args);
+	ClassDB::bind_method(_MD("set_use_default_args","amount"),&VisualScriptFunctionCall::set_use_default_args);
+	ClassDB::bind_method(_MD("get_use_default_args"),&VisualScriptFunctionCall::get_use_default_args);
 
-	ObjectTypeDB::bind_method(_MD("_set_argument_cache","argument_cache"),&VisualScriptFunctionCall::_set_argument_cache);
-	ObjectTypeDB::bind_method(_MD("_get_argument_cache"),&VisualScriptFunctionCall::_get_argument_cache);
+	ClassDB::bind_method(_MD("_set_argument_cache","argument_cache"),&VisualScriptFunctionCall::_set_argument_cache);
+	ClassDB::bind_method(_MD("_get_argument_cache"),&VisualScriptFunctionCall::_get_argument_cache);
 
-	ObjectTypeDB::bind_method(_MD("set_rpc_call_mode","mode"),&VisualScriptFunctionCall::set_rpc_call_mode);
-	ObjectTypeDB::bind_method(_MD("get_rpc_call_mode"),&VisualScriptFunctionCall::get_rpc_call_mode);
+	ClassDB::bind_method(_MD("set_rpc_call_mode","mode"),&VisualScriptFunctionCall::set_rpc_call_mode);
+	ClassDB::bind_method(_MD("get_rpc_call_mode"),&VisualScriptFunctionCall::get_rpc_call_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_validate","enable"),&VisualScriptFunctionCall::set_validate);
-	ObjectTypeDB::bind_method(_MD("get_validate"),&VisualScriptFunctionCall::get_validate);
+	ClassDB::bind_method(_MD("set_validate","enable"),&VisualScriptFunctionCall::set_validate);
+	ClassDB::bind_method(_MD("get_validate"),&VisualScriptFunctionCall::get_validate);
 
 	String bt;
 	for(int i=0;i<Variant::VARIANT_MAX;i++) {
@@ -1034,7 +1034,7 @@ StringName VisualScriptPropertySet::_get_base_type() const {
 	else if (call_mode==CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
 		if (path)
-			return path->get_type();
+			return path->get_class();
 
 	}
 
@@ -1122,7 +1122,7 @@ void VisualScriptPropertySet::_update_base_type() {
 
 		Node* node=_get_base_node();
 		if (node) {
-			base_type=node->get_type();
+			base_type=node->get_class();
 		}
 	} else if (call_mode==CALL_MODE_SELF) {
 
@@ -1247,7 +1247,7 @@ void VisualScriptPropertySet::_update_cache() {
 
 			node=_get_base_node();
 			if (node) {
-				type=node->get_type();
+				type=node->get_class();
 				base_type=type; //cache, too
 				script = node->get_script();
 			}
@@ -1284,7 +1284,7 @@ void VisualScriptPropertySet::_update_cache() {
 
 			node->get_property_list(&pinfo);
 		} else {
-			ObjectTypeDB::get_property_list(type,&pinfo);
+			ClassDB::get_property_list(type,&pinfo);
 		}
 
 		if (script.is_valid()) {
@@ -1453,29 +1453,29 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptPropertySet::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertySet::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptPropertySet::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertySet::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptPropertySet::get_base_type);
 
-	ObjectTypeDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertySet::set_base_script);
-	ObjectTypeDB::bind_method(_MD("get_base_script"),&VisualScriptPropertySet::get_base_script);
+	ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertySet::set_base_script);
+	ClassDB::bind_method(_MD("get_base_script"),&VisualScriptPropertySet::get_base_script);
 
-	ObjectTypeDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertySet::set_basic_type);
-	ObjectTypeDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertySet::get_basic_type);
+	ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertySet::set_basic_type);
+	ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertySet::get_basic_type);
 
-	ObjectTypeDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertySet::_set_type_cache);
-	ObjectTypeDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertySet::_get_type_cache);
+	ClassDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertySet::_set_type_cache);
+	ClassDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertySet::_get_type_cache);
 
-	ObjectTypeDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertySet::set_event_type);
-	ObjectTypeDB::bind_method(_MD("get_event_type"),&VisualScriptPropertySet::get_event_type);
+	ClassDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertySet::set_event_type);
+	ClassDB::bind_method(_MD("get_event_type"),&VisualScriptPropertySet::get_event_type);
 
-	ObjectTypeDB::bind_method(_MD("set_property","property"),&VisualScriptPropertySet::set_property);
-	ObjectTypeDB::bind_method(_MD("get_property"),&VisualScriptPropertySet::get_property);
+	ClassDB::bind_method(_MD("set_property","property"),&VisualScriptPropertySet::set_property);
+	ClassDB::bind_method(_MD("get_property"),&VisualScriptPropertySet::get_property);
 
-	ObjectTypeDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertySet::set_call_mode);
-	ObjectTypeDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertySet::get_call_mode);
+	ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertySet::set_call_mode);
+	ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertySet::get_call_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertySet::set_base_path);
-	ObjectTypeDB::bind_method(_MD("get_base_path"),&VisualScriptPropertySet::get_base_path);
+	ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertySet::set_base_path);
+	ClassDB::bind_method(_MD("get_base_path"),&VisualScriptPropertySet::get_base_path);
 
 
 
@@ -1554,7 +1554,7 @@ public:
 
 				if (!valid) {
 					r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
-					r_error_str="Invalid set value '"+String(*p_inputs[0])+"' on property '"+String(property)+"' of type "+object->get_type();
+					r_error_str="Invalid set value '"+String(*p_inputs[0])+"' on property '"+String(property)+"' of type "+object->get_class();
 				}
 			} break;
 			case VisualScriptPropertySet::CALL_MODE_NODE_PATH: {
@@ -1579,7 +1579,7 @@ public:
 
 				if (!valid) {
 					r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
-					r_error_str="Invalid set value '"+String(*p_inputs[0])+"' on property '"+String(property)+"' of type "+another->get_type();
+					r_error_str="Invalid set value '"+String(*p_inputs[0])+"' on property '"+String(property)+"' of type "+another->get_class();
 				}
 
 			} break;
@@ -1669,7 +1669,7 @@ void VisualScriptPropertyGet::_update_base_type() {
 
 		Node* node=_get_base_node();
 		if (node) {
-			base_type=node->get_type();
+			base_type=node->get_class();
 		}
 	} else if (call_mode==CALL_MODE_SELF) {
 
@@ -1724,7 +1724,7 @@ StringName VisualScriptPropertyGet::_get_base_type() const {
 	else if (call_mode==CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
 		if (path)
-			return path->get_type();
+			return path->get_class();
 
 	}
 
@@ -1868,7 +1868,7 @@ void VisualScriptPropertyGet::_update_cache() {
 
 			node=_get_base_node();
 			if (node) {
-				type=node->get_type();
+				type=node->get_class();
 				base_type=type; //cache, too
 				script = node->get_script();
 			}
@@ -1903,7 +1903,7 @@ void VisualScriptPropertyGet::_update_cache() {
 
 		Variant::Type type_ret;
 
-		type_ret=ObjectTypeDB::get_property_type(base_type,property,&valid);
+		type_ret=ClassDB::get_property_type(base_type,property,&valid);
 
 		if (valid) {
 			type_cache=type_ret;
@@ -2117,30 +2117,30 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptPropertyGet::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertyGet::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptPropertyGet::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertyGet::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptPropertyGet::get_base_type);
 
-	ObjectTypeDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertyGet::set_base_script);
-	ObjectTypeDB::bind_method(_MD("get_base_script"),&VisualScriptPropertyGet::get_base_script);
+	ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertyGet::set_base_script);
+	ClassDB::bind_method(_MD("get_base_script"),&VisualScriptPropertyGet::get_base_script);
 
-	ObjectTypeDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertyGet::set_basic_type);
-	ObjectTypeDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertyGet::get_basic_type);
+	ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertyGet::set_basic_type);
+	ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertyGet::get_basic_type);
 
-	ObjectTypeDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertyGet::_set_type_cache);
-	ObjectTypeDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertyGet::_get_type_cache);
+	ClassDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertyGet::_set_type_cache);
+	ClassDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertyGet::_get_type_cache);
 
-	ObjectTypeDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertyGet::set_event_type);
-	ObjectTypeDB::bind_method(_MD("get_event_type"),&VisualScriptPropertyGet::get_event_type);
+	ClassDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertyGet::set_event_type);
+	ClassDB::bind_method(_MD("get_event_type"),&VisualScriptPropertyGet::get_event_type);
 
 
-	ObjectTypeDB::bind_method(_MD("set_property","property"),&VisualScriptPropertyGet::set_property);
-	ObjectTypeDB::bind_method(_MD("get_property"),&VisualScriptPropertyGet::get_property);
+	ClassDB::bind_method(_MD("set_property","property"),&VisualScriptPropertyGet::set_property);
+	ClassDB::bind_method(_MD("get_property"),&VisualScriptPropertyGet::get_property);
 
-	ObjectTypeDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertyGet::set_call_mode);
-	ObjectTypeDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertyGet::get_call_mode);
+	ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertyGet::set_call_mode);
+	ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertyGet::get_call_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertyGet::set_base_path);
-	ObjectTypeDB::bind_method(_MD("get_base_path"),&VisualScriptPropertyGet::get_base_path);
+	ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertyGet::set_base_path);
+	ClassDB::bind_method(_MD("get_base_path"),&VisualScriptPropertyGet::get_base_path);
 
 	String bt;
 	for(int i=0;i<Variant::VARIANT_MAX;i++) {
@@ -2420,8 +2420,8 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptEmitSignal::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_signal","name"),&VisualScriptEmitSignal::set_signal);
-	ObjectTypeDB::bind_method(_MD("get_signal"),&VisualScriptEmitSignal::get_signal);
+	ClassDB::bind_method(_MD("set_signal","name"),&VisualScriptEmitSignal::set_signal);
+	ClassDB::bind_method(_MD("get_signal"),&VisualScriptEmitSignal::get_signal);
 
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"signal/signal"),_SCS("set_signal"),_SCS("get_signal"));
diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h
index 43ef276cf..7d33549e2 100644
--- a/modules/visual_script/visual_script_func_nodes.h
+++ b/modules/visual_script/visual_script_func_nodes.h
@@ -6,7 +6,7 @@
 
 class VisualScriptFunctionCall : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptFunctionCall,VisualScriptNode)
+	GDCLASS(VisualScriptFunctionCall,VisualScriptNode)
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -117,7 +117,7 @@ VARIANT_ENUM_CAST(VisualScriptFunctionCall::RPCCallMode );
 
 class VisualScriptPropertySet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptPropertySet,VisualScriptNode)
+	GDCLASS(VisualScriptPropertySet,VisualScriptNode)
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -208,7 +208,7 @@ VARIANT_ENUM_CAST(VisualScriptPropertySet::CallMode );
 
 class VisualScriptPropertyGet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptPropertyGet,VisualScriptNode)
+	GDCLASS(VisualScriptPropertyGet,VisualScriptNode)
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -299,7 +299,7 @@ VARIANT_ENUM_CAST(VisualScriptPropertyGet::CallMode );
 
 class VisualScriptEmitSignal : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptEmitSignal,VisualScriptNode)
+	GDCLASS(VisualScriptEmitSignal,VisualScriptNode)
 
 private:
 
diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp
index 8ffbcc6e6..07d234207 100644
--- a/modules/visual_script/visual_script_nodes.cpp
+++ b/modules/visual_script/visual_script_nodes.cpp
@@ -539,11 +539,11 @@ Variant::Type VisualScriptOperator::get_typed() const {
 
 void VisualScriptOperator::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_operator","op"),&VisualScriptOperator::set_operator);
-	ObjectTypeDB::bind_method(_MD("get_operator"),&VisualScriptOperator::get_operator);
+	ClassDB::bind_method(_MD("set_operator","op"),&VisualScriptOperator::set_operator);
+	ClassDB::bind_method(_MD("get_operator"),&VisualScriptOperator::get_operator);
 
-	ObjectTypeDB::bind_method(_MD("set_typed","type"),&VisualScriptOperator::set_typed);
-	ObjectTypeDB::bind_method(_MD("get_typed"),&VisualScriptOperator::get_typed);
+	ClassDB::bind_method(_MD("set_typed","type"),&VisualScriptOperator::set_typed);
+	ClassDB::bind_method(_MD("get_typed"),&VisualScriptOperator::get_typed);
 
 	String types;
 	for(int i=0;i<Variant::OP_MAX;i++) {
@@ -717,8 +717,8 @@ void VisualScriptVariableGet::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptVariableGet::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableGet::set_variable);
-	ObjectTypeDB::bind_method(_MD("get_variable"),&VisualScriptVariableGet::get_variable);
+	ClassDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableGet::set_variable);
+	ClassDB::bind_method(_MD("get_variable"),&VisualScriptVariableGet::get_variable);
 
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),_SCS("set_variable"),_SCS("get_variable"));
@@ -853,8 +853,8 @@ void VisualScriptVariableSet::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptVariableSet::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableSet::set_variable);
-	ObjectTypeDB::bind_method(_MD("get_variable"),&VisualScriptVariableSet::get_variable);
+	ClassDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableSet::set_variable);
+	ClassDB::bind_method(_MD("get_variable"),&VisualScriptVariableSet::get_variable);
 
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),_SCS("set_variable"),_SCS("get_variable"));
@@ -995,11 +995,11 @@ void VisualScriptConstant::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptConstant::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_constant_type","type"),&VisualScriptConstant::set_constant_type);
-	ObjectTypeDB::bind_method(_MD("get_constant_type"),&VisualScriptConstant::get_constant_type);
+	ClassDB::bind_method(_MD("set_constant_type","type"),&VisualScriptConstant::set_constant_type);
+	ClassDB::bind_method(_MD("get_constant_type"),&VisualScriptConstant::get_constant_type);
 
-	ObjectTypeDB::bind_method(_MD("set_constant_value","value"),&VisualScriptConstant::set_constant_value);
-	ObjectTypeDB::bind_method(_MD("get_constant_value"),&VisualScriptConstant::get_constant_value);
+	ClassDB::bind_method(_MD("set_constant_value","value"),&VisualScriptConstant::set_constant_value);
+	ClassDB::bind_method(_MD("get_constant_value"),&VisualScriptConstant::get_constant_value);
 
 	String argt="Null";
 	for(int i=1;i<Variant::VARIANT_MAX;i++) {
@@ -1078,7 +1078,7 @@ PropertyInfo VisualScriptPreload::get_output_value_port_info(int p_idx) const{
 	PropertyInfo pinfo=PropertyInfo(Variant::OBJECT,"res");
 	if (preload.is_valid()) {
 		pinfo.hint=PROPERTY_HINT_RESOURCE_TYPE;
-		pinfo.hint_string=preload->get_type();
+		pinfo.hint_string=preload->get_class();
 	}
 
 	return pinfo;
@@ -1098,7 +1098,7 @@ String VisualScriptPreload::get_text() const {
 		} else if (preload->get_name()!=String()) {
 			return preload->get_name();
 		} else {
-			return preload->get_type();
+			return preload->get_class();
 		}
 	} else {
 		return "<empty>";
@@ -1123,8 +1123,8 @@ Ref<Resource> VisualScriptPreload::get_preload() const{
 void VisualScriptPreload::_bind_methods() {
 
 
-	ObjectTypeDB::bind_method(_MD("set_preload","resource"),&VisualScriptPreload::set_preload);
-	ObjectTypeDB::bind_method(_MD("get_preload"),&VisualScriptPreload::get_preload);
+	ClassDB::bind_method(_MD("set_preload","resource"),&VisualScriptPreload::set_preload);
+	ClassDB::bind_method(_MD("get_preload"),&VisualScriptPreload::get_preload);
 
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"resource",PROPERTY_HINT_RESOURCE_TYPE,"Resource"),_SCS("set_preload"),_SCS("get_preload"));
@@ -1425,8 +1425,8 @@ VisualScriptNodeInstance* VisualScriptGlobalConstant::instance(VisualScriptInsta
 
 void VisualScriptGlobalConstant::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_global_constant","index"),&VisualScriptGlobalConstant::set_global_constant);
-	ObjectTypeDB::bind_method(_MD("get_global_constant"),&VisualScriptGlobalConstant::get_global_constant);
+	ClassDB::bind_method(_MD("set_global_constant","index"),&VisualScriptGlobalConstant::set_global_constant);
+	ClassDB::bind_method(_MD("get_global_constant"),&VisualScriptGlobalConstant::get_global_constant);
 
 	String cc;
 
@@ -1540,7 +1540,7 @@ public:
 VisualScriptNodeInstance* VisualScriptClassConstant::instance(VisualScriptInstance* p_instance) {
 
 	VisualScriptNodeInstanceClassConstant * instance = memnew(VisualScriptNodeInstanceClassConstant );
-	instance->value=ObjectTypeDB::get_integer_constant(base_type,name,&instance->valid);
+	instance->value=ClassDB::get_integer_constant(base_type,name,&instance->valid);
 	return instance;
 }
 
@@ -1549,7 +1549,7 @@ void VisualScriptClassConstant::_validate_property(PropertyInfo& property) const
 	if (property.name=="constant") {
 
 		List<String> constants;
-		ObjectTypeDB::get_integer_constant_list(base_type,&constants,true);
+		ClassDB::get_integer_constant_list(base_type,&constants,true);
 
 		property.hint_string="";
 		for(List<String>::Element *E=constants.front();E;E=E->next()) {
@@ -1563,11 +1563,11 @@ void VisualScriptClassConstant::_validate_property(PropertyInfo& property) const
 
 void VisualScriptClassConstant::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_class_constant","name"),&VisualScriptClassConstant::set_class_constant);
-	ObjectTypeDB::bind_method(_MD("get_class_constant"),&VisualScriptClassConstant::get_class_constant);
+	ClassDB::bind_method(_MD("set_class_constant","name"),&VisualScriptClassConstant::set_class_constant);
+	ClassDB::bind_method(_MD("get_class_constant"),&VisualScriptClassConstant::get_class_constant);
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","name"),&VisualScriptClassConstant::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptClassConstant::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","name"),&VisualScriptClassConstant::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptClassConstant::get_base_type);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"base_type",PROPERTY_HINT_TYPE_STRING,"Object"),_SCS("set_base_type"),_SCS("get_base_type"));
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"constant",PROPERTY_HINT_ENUM,""),_SCS("set_class_constant"),_SCS("get_class_constant"));
@@ -1703,11 +1703,11 @@ void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo& property) c
 
 void VisualScriptBasicTypeConstant::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_basic_type","name"),&VisualScriptBasicTypeConstant::set_basic_type);
-	ObjectTypeDB::bind_method(_MD("get_basic_type"),&VisualScriptBasicTypeConstant::get_basic_type);
+	ClassDB::bind_method(_MD("set_basic_type","name"),&VisualScriptBasicTypeConstant::set_basic_type);
+	ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptBasicTypeConstant::get_basic_type);
 
-	ObjectTypeDB::bind_method(_MD("set_basic_type_constant","name"),&VisualScriptBasicTypeConstant::set_basic_type_constant);
-	ObjectTypeDB::bind_method(_MD("get_basic_type_constant"),&VisualScriptBasicTypeConstant::get_basic_type_constant);
+	ClassDB::bind_method(_MD("set_basic_type_constant","name"),&VisualScriptBasicTypeConstant::set_basic_type_constant);
+	ClassDB::bind_method(_MD("get_basic_type_constant"),&VisualScriptBasicTypeConstant::get_basic_type_constant);
 
 
 	String argt="Null";
@@ -1831,8 +1831,8 @@ VisualScriptNodeInstance* VisualScriptMathConstant::instance(VisualScriptInstanc
 
 void VisualScriptMathConstant::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_math_constant","which"),&VisualScriptMathConstant::set_math_constant);
-	ObjectTypeDB::bind_method(_MD("get_math_constant"),&VisualScriptMathConstant::get_math_constant);
+	ClassDB::bind_method(_MD("set_math_constant","which"),&VisualScriptMathConstant::set_math_constant);
+	ClassDB::bind_method(_MD("get_math_constant"),&VisualScriptMathConstant::get_math_constant);
 
 	String cc;
 
@@ -1943,7 +1943,7 @@ VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output
 	TypeGuess tg;
 	tg.type=Variant::OBJECT;
 	if (obj) {
-		tg.obj_type=obj->get_type();
+		tg.GDCLASS=obj->get_class();
 		tg.script=obj->get_script();
 	}
 
@@ -1953,8 +1953,8 @@ VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output
 
 void VisualScriptEngineSingleton::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_singleton","name"),&VisualScriptEngineSingleton::set_singleton);
-	ObjectTypeDB::bind_method(_MD("get_singleton"),&VisualScriptEngineSingleton::get_singleton);
+	ClassDB::bind_method(_MD("set_singleton","name"),&VisualScriptEngineSingleton::set_singleton);
+	ClassDB::bind_method(_MD("get_singleton"),&VisualScriptEngineSingleton::get_singleton);
 
 	String cc;
 
@@ -2117,7 +2117,7 @@ VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGu
 
 	VisualScriptSceneNode::TypeGuess tg;
 	tg.type=Variant::OBJECT;
-	tg.obj_type="Node";
+	tg.GDCLASS="Node";
 
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
@@ -2146,7 +2146,7 @@ VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGu
 	Node* another = script_node->get_node(path);
 
 	if (another) {
-		tg.obj_type=another->get_type();
+		tg.GDCLASS=another->get_class();
 		tg.script=another->get_script();
 	}
 #endif
@@ -2190,8 +2190,8 @@ void VisualScriptSceneNode::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptSceneNode::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_node_path","path"),&VisualScriptSceneNode::set_node_path);
-	ObjectTypeDB::bind_method(_MD("get_node_path"),&VisualScriptSceneNode::get_node_path);
+	ClassDB::bind_method(_MD("set_node_path","path"),&VisualScriptSceneNode::set_node_path);
+	ClassDB::bind_method(_MD("get_node_path"),&VisualScriptSceneNode::get_node_path);
 
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH,"node_path",PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE),_SCS("set_node_path"),_SCS("get_node_path"));
 }
@@ -2296,7 +2296,7 @@ VisualScriptSceneTree::TypeGuess VisualScriptSceneTree::guess_output_type(TypeGu
 
 	TypeGuess tg;
 	tg.type=Variant::OBJECT;
-	tg.obj_type="SceneTree";
+	tg.GDCLASS="SceneTree";
 	return tg;
 }
 
@@ -2401,8 +2401,8 @@ VisualScriptNodeInstance* VisualScriptResourcePath::instance(VisualScriptInstanc
 
 void VisualScriptResourcePath::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_resource_path","path"),&VisualScriptResourcePath::set_resource_path);
-	ObjectTypeDB::bind_method(_MD("get_resource_path"),&VisualScriptResourcePath::get_resource_path);
+	ClassDB::bind_method(_MD("set_resource_path","path"),&VisualScriptResourcePath::set_resource_path);
+	ClassDB::bind_method(_MD("get_resource_path"),&VisualScriptResourcePath::get_resource_path);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING,"path",PROPERTY_HINT_FILE),_SCS("set_resource_path"),_SCS("get_resource_path"));
 }
@@ -2494,13 +2494,13 @@ VisualScriptSelf::TypeGuess VisualScriptSelf::guess_output_type(TypeGuess* p_inp
 
 	VisualScriptSceneNode::TypeGuess tg;
 	tg.type=Variant::OBJECT;
-	tg.obj_type="Object";
+	tg.GDCLASS="Object";
 
 	Ref<Script> script = get_visual_script();
 	if (!script.is_valid())
 		return tg;
 
-	tg.obj_type=script->get_instance_base_type();
+	tg.GDCLASS=script->get_instance_base_type();
 	tg.script=script;
 
 	return tg;
@@ -2817,7 +2817,7 @@ String VisualScriptSubCall::get_text() const {
 			return script->get_name();
 		if (script->get_path().is_resource_file())
 			return script->get_path().get_file();
-		return script->get_type();
+		return script->get_class();
 	}
 	return "";
 }
@@ -3001,14 +3001,14 @@ VisualScriptNodeInstance* VisualScriptComment::instance(VisualScriptInstance* p_
 void VisualScriptComment::_bind_methods() {
 
 
-	ObjectTypeDB::bind_method(_MD("set_title","title"),&VisualScriptComment::set_title);
-	ObjectTypeDB::bind_method(_MD("get_title"),&VisualScriptComment::get_title);
+	ClassDB::bind_method(_MD("set_title","title"),&VisualScriptComment::set_title);
+	ClassDB::bind_method(_MD("get_title"),&VisualScriptComment::get_title);
 
-	ObjectTypeDB::bind_method(_MD("set_description","description"),&VisualScriptComment::set_description);
-	ObjectTypeDB::bind_method(_MD("get_description"),&VisualScriptComment::get_description);
+	ClassDB::bind_method(_MD("set_description","description"),&VisualScriptComment::set_description);
+	ClassDB::bind_method(_MD("get_description"),&VisualScriptComment::get_description);
 
-	ObjectTypeDB::bind_method(_MD("set_size","size"),&VisualScriptComment::set_size);
-	ObjectTypeDB::bind_method(_MD("get_size"),&VisualScriptComment::get_size);
+	ClassDB::bind_method(_MD("set_size","size"),&VisualScriptComment::set_size);
+	ClassDB::bind_method(_MD("get_size"),&VisualScriptComment::get_size);
 
 	ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),_SCS("set_title"),_SCS("get_title"));
 	ADD_PROPERTY( PropertyInfo(Variant::STRING,"description",PROPERTY_HINT_MULTILINE_TEXT),_SCS("set_description"),_SCS("get_description"));
@@ -3140,11 +3140,11 @@ VisualScriptNodeInstance* VisualScriptConstructor::instance(VisualScriptInstance
 
 void VisualScriptConstructor::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_constructor_type","type"),&VisualScriptConstructor::set_constructor_type);
-	ObjectTypeDB::bind_method(_MD("get_constructor_type"),&VisualScriptConstructor::get_constructor_type);
+	ClassDB::bind_method(_MD("set_constructor_type","type"),&VisualScriptConstructor::set_constructor_type);
+	ClassDB::bind_method(_MD("get_constructor_type"),&VisualScriptConstructor::get_constructor_type);
 
-	ObjectTypeDB::bind_method(_MD("set_constructor","constructor"),&VisualScriptConstructor::set_constructor);
-	ObjectTypeDB::bind_method(_MD("get_constructor"),&VisualScriptConstructor::get_constructor);
+	ClassDB::bind_method(_MD("set_constructor","constructor"),&VisualScriptConstructor::set_constructor);
+	ClassDB::bind_method(_MD("get_constructor"),&VisualScriptConstructor::get_constructor);
 
 	ADD_PROPERTY( PropertyInfo(Variant::INT,"type",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("set_constructor_type"),_SCS("get_constructor_type"));
 	ADD_PROPERTY( PropertyInfo(Variant::DICTIONARY,"constructor",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("set_constructor"),_SCS("get_constructor"));
@@ -3283,11 +3283,11 @@ VisualScriptNodeInstance* VisualScriptLocalVar::instance(VisualScriptInstance* p
 
 void VisualScriptLocalVar::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVar::set_var_name);
-	ObjectTypeDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVar::get_var_name);
+	ClassDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVar::set_var_name);
+	ClassDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVar::get_var_name);
 
-	ObjectTypeDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVar::set_var_type);
-	ObjectTypeDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVar::get_var_type);
+	ClassDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVar::set_var_type);
+	ClassDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVar::get_var_type);
 
 	String argt="Any";
 	for(int i=1;i<Variant::VARIANT_MAX;i++) {
@@ -3420,11 +3420,11 @@ VisualScriptNodeInstance* VisualScriptLocalVarSet::instance(VisualScriptInstance
 
 void VisualScriptLocalVarSet::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVarSet::set_var_name);
-	ObjectTypeDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVarSet::get_var_name);
+	ClassDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVarSet::set_var_name);
+	ClassDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVarSet::get_var_name);
 
-	ObjectTypeDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVarSet::set_var_type);
-	ObjectTypeDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVarSet::get_var_type);
+	ClassDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVarSet::set_var_type);
+	ClassDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVarSet::get_var_type);
 
 	String argt="Any";
 	for(int i=1;i<Variant::VARIANT_MAX;i++) {
@@ -3630,11 +3630,11 @@ void VisualScriptInputAction::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptInputAction::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_action_name","name"),&VisualScriptInputAction::set_action_name);
-	ObjectTypeDB::bind_method(_MD("get_action_name"),&VisualScriptInputAction::get_action_name);
+	ClassDB::bind_method(_MD("set_action_name","name"),&VisualScriptInputAction::set_action_name);
+	ClassDB::bind_method(_MD("get_action_name"),&VisualScriptInputAction::get_action_name);
 
-	ObjectTypeDB::bind_method(_MD("set_action_mode","mode"),&VisualScriptInputAction::set_action_mode);
-	ObjectTypeDB::bind_method(_MD("get_action_mode"),&VisualScriptInputAction::get_action_mode);
+	ClassDB::bind_method(_MD("set_action_mode","mode"),&VisualScriptInputAction::set_action_mode);
+	ClassDB::bind_method(_MD("get_action_mode"),&VisualScriptInputAction::get_action_mode);
 
 	ADD_PROPERTY( PropertyInfo(Variant::STRING,"action"),_SCS("set_action_name"),_SCS("get_action_name"));
 	ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Pressed,Released,JustPressed,JustReleased"),_SCS("set_action_mode"),_SCS("get_action_mode"));
@@ -3834,14 +3834,14 @@ void VisualScriptDeconstruct::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptDeconstruct::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_deconstruct_type","type"),&VisualScriptDeconstruct::set_deconstruct_type);
-	ObjectTypeDB::bind_method(_MD("get_deconstruct_type"),&VisualScriptDeconstruct::get_deconstruct_type);
+	ClassDB::bind_method(_MD("set_deconstruct_type","type"),&VisualScriptDeconstruct::set_deconstruct_type);
+	ClassDB::bind_method(_MD("get_deconstruct_type"),&VisualScriptDeconstruct::get_deconstruct_type);
 
-	ObjectTypeDB::bind_method(_MD("set_deconstruct_input_type","input_type"),&VisualScriptDeconstruct::set_deconstruct_input_type);
-	ObjectTypeDB::bind_method(_MD("get_deconstruct_input_type"),&VisualScriptDeconstruct::get_deconstruct_input_type);
+	ClassDB::bind_method(_MD("set_deconstruct_input_type","input_type"),&VisualScriptDeconstruct::set_deconstruct_input_type);
+	ClassDB::bind_method(_MD("get_deconstruct_input_type"),&VisualScriptDeconstruct::get_deconstruct_input_type);
 
-	ObjectTypeDB::bind_method(_MD("_set_elem_cache","_cache"),&VisualScriptDeconstruct::_set_elem_cache);
-	ObjectTypeDB::bind_method(_MD("_get_elem_cache"),&VisualScriptDeconstruct::_get_elem_cache);
+	ClassDB::bind_method(_MD("_set_elem_cache","_cache"),&VisualScriptDeconstruct::_set_elem_cache);
+	ClassDB::bind_method(_MD("_get_elem_cache"),&VisualScriptDeconstruct::_get_elem_cache);
 
 	String argt="Any";
 	for(int i=1;i<Variant::VARIANT_MAX;i++) {
diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h
index 94eeadca5..eb70c8663 100644
--- a/modules/visual_script/visual_script_nodes.h
+++ b/modules/visual_script/visual_script_nodes.h
@@ -5,7 +5,7 @@
 
 class VisualScriptFunction : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptFunction,VisualScriptNode)
+	GDCLASS(VisualScriptFunction,VisualScriptNode)
 
 
 	struct Argument {
@@ -72,7 +72,7 @@ public:
 
 class VisualScriptOperator : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptOperator,VisualScriptNode)
+	GDCLASS(VisualScriptOperator,VisualScriptNode)
 
 
 	Variant::Type typed;
@@ -114,7 +114,7 @@ public:
 
 class VisualScriptVariableGet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptVariableGet,VisualScriptNode)
+	GDCLASS(VisualScriptVariableGet,VisualScriptNode)
 
 
 	StringName variable;
@@ -153,7 +153,7 @@ public:
 
 class VisualScriptVariableSet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptVariableSet,VisualScriptNode)
+	GDCLASS(VisualScriptVariableSet,VisualScriptNode)
 
 
 	StringName variable;
@@ -192,7 +192,7 @@ public:
 
 class VisualScriptConstant : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptConstant,VisualScriptNode)
+	GDCLASS(VisualScriptConstant,VisualScriptNode)
 
 
 	Variant::Type type;
@@ -236,7 +236,7 @@ public:
 
 class VisualScriptPreload : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptPreload,VisualScriptNode)
+	GDCLASS(VisualScriptPreload,VisualScriptNode)
 
 
 	Ref<Resource> preload;
@@ -274,7 +274,7 @@ public:
 
 class VisualScriptIndexGet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptIndexGet,VisualScriptNode)
+	GDCLASS(VisualScriptIndexGet,VisualScriptNode)
 
 
 public:
@@ -305,7 +305,7 @@ public:
 
 class VisualScriptIndexSet : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptIndexSet,VisualScriptNode)
+	GDCLASS(VisualScriptIndexSet,VisualScriptNode)
 
 
 public:
@@ -337,7 +337,7 @@ public:
 
 class VisualScriptGlobalConstant : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptGlobalConstant,VisualScriptNode)
+	GDCLASS(VisualScriptGlobalConstant,VisualScriptNode)
 
 	int index;
 
@@ -373,7 +373,7 @@ public:
 
 class VisualScriptClassConstant : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptClassConstant,VisualScriptNode)
+	GDCLASS(VisualScriptClassConstant,VisualScriptNode)
 
 	StringName base_type;
 	StringName name;
@@ -414,7 +414,7 @@ public:
 
 class VisualScriptBasicTypeConstant : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptBasicTypeConstant,VisualScriptNode)
+	GDCLASS(VisualScriptBasicTypeConstant,VisualScriptNode)
 
 	Variant::Type type;
 	StringName name;
@@ -457,7 +457,7 @@ public:
 
 class VisualScriptMathConstant : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptMathConstant,VisualScriptNode)
+	GDCLASS(VisualScriptMathConstant,VisualScriptNode)
 public:
 
 	enum MathConstant {
@@ -508,7 +508,7 @@ VARIANT_ENUM_CAST( VisualScriptMathConstant::MathConstant )
 
 class VisualScriptEngineSingleton : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptEngineSingleton,VisualScriptNode)
+	GDCLASS(VisualScriptEngineSingleton,VisualScriptNode)
 
 	String singleton;
 
@@ -549,7 +549,7 @@ public:
 
 class VisualScriptSceneNode : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSceneNode,VisualScriptNode)
+	GDCLASS(VisualScriptSceneNode,VisualScriptNode)
 
 	NodePath path;
 protected:
@@ -590,7 +590,7 @@ public:
 
 class VisualScriptSceneTree : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSceneTree,VisualScriptNode)
+	GDCLASS(VisualScriptSceneTree,VisualScriptNode)
 
 
 protected:
@@ -627,7 +627,7 @@ public:
 
 class VisualScriptResourcePath : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptResourcePath,VisualScriptNode)
+	GDCLASS(VisualScriptResourcePath,VisualScriptNode)
 
 	String path;
 protected:
@@ -664,7 +664,7 @@ public:
 
 class VisualScriptSelf : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSelf,VisualScriptNode)
+	GDCLASS(VisualScriptSelf,VisualScriptNode)
 
 
 protected:
@@ -701,7 +701,7 @@ public:
 
 class VisualScriptCustomNode: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptCustomNode,VisualScriptNode)
+	GDCLASS(VisualScriptCustomNode,VisualScriptNode)
 
 
 protected:
@@ -752,7 +752,7 @@ public:
 
 class VisualScriptSubCall: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptSubCall,VisualScriptNode)
+	GDCLASS(VisualScriptSubCall,VisualScriptNode)
 
 
 protected:
@@ -785,7 +785,7 @@ public:
 
 class VisualScriptComment: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptComment,VisualScriptNode)
+	GDCLASS(VisualScriptComment,VisualScriptNode)
 
 
 	String title;
@@ -829,7 +829,7 @@ public:
 
 class VisualScriptConstructor: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptConstructor,VisualScriptNode)
+	GDCLASS(VisualScriptConstructor,VisualScriptNode)
 
 
 	Variant::Type type;
@@ -874,7 +874,7 @@ public:
 
 class VisualScriptLocalVar: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptLocalVar,VisualScriptNode)
+	GDCLASS(VisualScriptLocalVar,VisualScriptNode)
 
 	StringName name;
 	Variant::Type type;
@@ -914,7 +914,7 @@ public:
 
 class VisualScriptLocalVarSet: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptLocalVarSet,VisualScriptNode)
+	GDCLASS(VisualScriptLocalVarSet,VisualScriptNode)
 
 	StringName name;
 	Variant::Type type;
@@ -956,7 +956,7 @@ public:
 
 class VisualScriptInputAction: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptInputAction,VisualScriptNode)
+	GDCLASS(VisualScriptInputAction,VisualScriptNode)
 public:
 	enum Mode {
 		MODE_PRESSED,
@@ -1007,7 +1007,7 @@ VARIANT_ENUM_CAST( VisualScriptInputAction::Mode )
 
 class VisualScriptDeconstruct: public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptDeconstruct,VisualScriptNode)
+	GDCLASS(VisualScriptDeconstruct,VisualScriptNode)
 
 
 	struct Element {
diff --git a/modules/visual_script/visual_script_yield_nodes.cpp b/modules/visual_script/visual_script_yield_nodes.cpp
index 221c46b6f..8b251e667 100644
--- a/modules/visual_script/visual_script_yield_nodes.cpp
+++ b/modules/visual_script/visual_script_yield_nodes.cpp
@@ -157,11 +157,11 @@ void VisualScriptYield::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptYield::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_yield_mode","mode"),&VisualScriptYield::set_yield_mode);
-	ObjectTypeDB::bind_method(_MD("get_yield_mode"),&VisualScriptYield::get_yield_mode);
+	ClassDB::bind_method(_MD("set_yield_mode","mode"),&VisualScriptYield::set_yield_mode);
+	ClassDB::bind_method(_MD("get_yield_mode"),&VisualScriptYield::get_yield_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_wait_time","sec"),&VisualScriptYield::set_wait_time);
-	ObjectTypeDB::bind_method(_MD("get_wait_time"),&VisualScriptYield::get_wait_time);
+	ClassDB::bind_method(_MD("set_wait_time","sec"),&VisualScriptYield::set_wait_time);
+	ClassDB::bind_method(_MD("get_wait_time"),&VisualScriptYield::get_wait_time);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Frame,FixedFrame,Time",PROPERTY_USAGE_NOEDITOR),_SCS("set_yield_mode"),_SCS("get_yield_mode"));
 	ADD_PROPERTY(PropertyInfo(Variant::REAL,"wait_time"),_SCS("set_wait_time"),_SCS("get_wait_time"));
@@ -270,7 +270,7 @@ StringName VisualScriptYieldSignal::_get_base_type() const {
 	else if (call_mode==CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
 		if (path)
-			return path->get_type();
+			return path->get_class();
 
 	}
 
@@ -290,7 +290,7 @@ int VisualScriptYieldSignal::get_output_value_port_count() const{
 
 	MethodInfo sr;
 
-	if (!ObjectTypeDB::get_signal(_get_base_type(),signal,&sr))
+	if (!ClassDB::get_signal(_get_base_type(),signal,&sr))
 		return 0;
 
 	return sr.arguments.size();
@@ -315,7 +315,7 @@ PropertyInfo VisualScriptYieldSignal::get_output_value_port_info(int p_idx) cons
 
 	MethodInfo sr;
 
-	if (!ObjectTypeDB::get_signal(_get_base_type(),signal,&sr))
+	if (!ClassDB::get_signal(_get_base_type(),signal,&sr))
 		return PropertyInfo(); //no signal
 	ERR_FAIL_INDEX_V(p_idx,sr.arguments.size(),PropertyInfo());
 	return sr.arguments[p_idx];
@@ -440,7 +440,7 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo& property) const {
 
 		List<MethodInfo> methods;
 
-		ObjectTypeDB::get_signal_list(_get_base_type(),&methods);
+		ClassDB::get_signal_list(_get_base_type(),&methods);
 
 		List<String> mstring;
 		for (List<MethodInfo>::Element *E=methods.front();E;E=E->next()) {
@@ -468,17 +468,17 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo& property) const {
 
 void VisualScriptYieldSignal::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptYieldSignal::set_base_type);
-	ObjectTypeDB::bind_method(_MD("get_base_type"),&VisualScriptYieldSignal::get_base_type);
+	ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptYieldSignal::set_base_type);
+	ClassDB::bind_method(_MD("get_base_type"),&VisualScriptYieldSignal::get_base_type);
 
-	ObjectTypeDB::bind_method(_MD("set_signal","signal"),&VisualScriptYieldSignal::set_signal);
-	ObjectTypeDB::bind_method(_MD("get_signal"),&VisualScriptYieldSignal::get_signal);
+	ClassDB::bind_method(_MD("set_signal","signal"),&VisualScriptYieldSignal::set_signal);
+	ClassDB::bind_method(_MD("get_signal"),&VisualScriptYieldSignal::get_signal);
 
-	ObjectTypeDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptYieldSignal::set_call_mode);
-	ObjectTypeDB::bind_method(_MD("get_call_mode"),&VisualScriptYieldSignal::get_call_mode);
+	ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptYieldSignal::set_call_mode);
+	ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptYieldSignal::get_call_mode);
 
-	ObjectTypeDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptYieldSignal::set_base_path);
-	ObjectTypeDB::bind_method(_MD("get_base_path"),&VisualScriptYieldSignal::get_base_path);
+	ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptYieldSignal::set_base_path);
+	ClassDB::bind_method(_MD("get_base_path"),&VisualScriptYieldSignal::get_base_path);
 
 
 
diff --git a/modules/visual_script/visual_script_yield_nodes.h b/modules/visual_script/visual_script_yield_nodes.h
index ae7f8c15c..210d6ec99 100644
--- a/modules/visual_script/visual_script_yield_nodes.h
+++ b/modules/visual_script/visual_script_yield_nodes.h
@@ -5,7 +5,7 @@
 
 class VisualScriptYield : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptYield,VisualScriptNode)
+	GDCLASS(VisualScriptYield,VisualScriptNode)
 public:
 
 	enum YieldMode {
@@ -60,7 +60,7 @@ VARIANT_ENUM_CAST( VisualScriptYield::YieldMode )
 
 class VisualScriptYieldSignal : public VisualScriptNode {
 
-	OBJ_TYPE(VisualScriptYieldSignal,VisualScriptNode)
+	GDCLASS(VisualScriptYieldSignal,VisualScriptNode)
 public:
 	enum CallMode {
 		CALL_MODE_SELF,