8 files changed, 117 insertions, 117 deletions

diff --git a/scene/audio/event_player.cpp b/scene/audio/event_player.cpp
index fb83b8252..153a8a27b 100644
--- a/scene/audio/event_player.cpp
+++ b/scene/audio/event_player.cpp
@@ -282,49 +282,49 @@ float EventPlayer::get_channel_last_note_time(int p_channel) const {
 
 void EventPlayer::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_stream","stream:EventStream"),&EventPlayer::set_stream);
-	ObjectTypeDB::bind_method(_MD("get_stream:EventStream"),&EventPlayer::get_stream);
+	ClassDB::bind_method(_MD("set_stream","stream:EventStream"),&EventPlayer::set_stream);
+	ClassDB::bind_method(_MD("get_stream:EventStream"),&EventPlayer::get_stream);
 
-	ObjectTypeDB::bind_method(_MD("play"),&EventPlayer::play);
-	ObjectTypeDB::bind_method(_MD("stop"),&EventPlayer::stop);
+	ClassDB::bind_method(_MD("play"),&EventPlayer::play);
+	ClassDB::bind_method(_MD("stop"),&EventPlayer::stop);
 
-	ObjectTypeDB::bind_method(_MD("is_playing"),&EventPlayer::is_playing);
+	ClassDB::bind_method(_MD("is_playing"),&EventPlayer::is_playing);
 
-	ObjectTypeDB::bind_method(_MD("set_paused","paused"),&EventPlayer::set_paused);
-	ObjectTypeDB::bind_method(_MD("is_paused"),&EventPlayer::is_paused);
+	ClassDB::bind_method(_MD("set_paused","paused"),&EventPlayer::set_paused);
+	ClassDB::bind_method(_MD("is_paused"),&EventPlayer::is_paused);
 
-	ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&EventPlayer::set_loop);
-	ObjectTypeDB::bind_method(_MD("has_loop"),&EventPlayer::has_loop);
+	ClassDB::bind_method(_MD("set_loop","enabled"),&EventPlayer::set_loop);
+	ClassDB::bind_method(_MD("has_loop"),&EventPlayer::has_loop);
 
-	ObjectTypeDB::bind_method(_MD("set_volume","volume"),&EventPlayer::set_volume);
-	ObjectTypeDB::bind_method(_MD("get_volume"),&EventPlayer::get_volume);
+	ClassDB::bind_method(_MD("set_volume","volume"),&EventPlayer::set_volume);
+	ClassDB::bind_method(_MD("get_volume"),&EventPlayer::get_volume);
 
-	ObjectTypeDB::bind_method(_MD("set_pitch_scale","pitch_scale"),&EventPlayer::set_pitch_scale);
-	ObjectTypeDB::bind_method(_MD("get_pitch_scale"),&EventPlayer::get_pitch_scale);
+	ClassDB::bind_method(_MD("set_pitch_scale","pitch_scale"),&EventPlayer::set_pitch_scale);
+	ClassDB::bind_method(_MD("get_pitch_scale"),&EventPlayer::get_pitch_scale);
 
-	ObjectTypeDB::bind_method(_MD("set_tempo_scale","tempo_scale"),&EventPlayer::set_tempo_scale);
-	ObjectTypeDB::bind_method(_MD("get_tempo_scale"),&EventPlayer::get_tempo_scale);
+	ClassDB::bind_method(_MD("set_tempo_scale","tempo_scale"),&EventPlayer::set_tempo_scale);
+	ClassDB::bind_method(_MD("get_tempo_scale"),&EventPlayer::get_tempo_scale);
 
-	ObjectTypeDB::bind_method(_MD("set_volume_db","db"),&EventPlayer::set_volume_db);
-	ObjectTypeDB::bind_method(_MD("get_volume_db"),&EventPlayer::get_volume_db);
+	ClassDB::bind_method(_MD("set_volume_db","db"),&EventPlayer::set_volume_db);
+	ClassDB::bind_method(_MD("get_volume_db"),&EventPlayer::get_volume_db);
 
-	ObjectTypeDB::bind_method(_MD("get_stream_name"),&EventPlayer::get_stream_name);
-	ObjectTypeDB::bind_method(_MD("get_loop_count"),&EventPlayer::get_loop_count);
+	ClassDB::bind_method(_MD("get_stream_name"),&EventPlayer::get_stream_name);
+	ClassDB::bind_method(_MD("get_loop_count"),&EventPlayer::get_loop_count);
 
-	ObjectTypeDB::bind_method(_MD("get_pos"),&EventPlayer::get_pos);
-	ObjectTypeDB::bind_method(_MD("seek_pos","time"),&EventPlayer::seek_pos);
+	ClassDB::bind_method(_MD("get_pos"),&EventPlayer::get_pos);
+	ClassDB::bind_method(_MD("seek_pos","time"),&EventPlayer::seek_pos);
 
-	ObjectTypeDB::bind_method(_MD("get_length"),&EventPlayer::get_length);
+	ClassDB::bind_method(_MD("get_length"),&EventPlayer::get_length);
 
-	ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&EventPlayer::set_autoplay);
-	ObjectTypeDB::bind_method(_MD("has_autoplay"),&EventPlayer::has_autoplay);
+	ClassDB::bind_method(_MD("set_autoplay","enabled"),&EventPlayer::set_autoplay);
+	ClassDB::bind_method(_MD("has_autoplay"),&EventPlayer::has_autoplay);
 
-	ObjectTypeDB::bind_method(_MD("set_channel_volume","channel","channel_volume"),&EventPlayer::set_channel_volume);
-	ObjectTypeDB::bind_method(_MD("get_channel_volume","channel"),&EventPlayer::get_channel_volume);
-	ObjectTypeDB::bind_method(_MD("get_channel_last_note_time","channel"),&EventPlayer::get_channel_last_note_time);
+	ClassDB::bind_method(_MD("set_channel_volume","channel","channel_volume"),&EventPlayer::set_channel_volume);
+	ClassDB::bind_method(_MD("get_channel_volume","channel"),&EventPlayer::get_channel_volume);
+	ClassDB::bind_method(_MD("get_channel_last_note_time","channel"),&EventPlayer::get_channel_last_note_time);
 
-	ObjectTypeDB::bind_method(_MD("_set_play","play"),&EventPlayer::_set_play);
-	ObjectTypeDB::bind_method(_MD("_get_play"),&EventPlayer::_get_play);
+	ClassDB::bind_method(_MD("_set_play","play"),&EventPlayer::_set_play);
+	ClassDB::bind_method(_MD("_get_play"),&EventPlayer::_get_play);
 
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"EventStream"), _SCS("set_stream"), _SCS("get_stream") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") );
diff --git a/scene/audio/event_player.h b/scene/audio/event_player.h
index 2d1402fc8..715017e0d 100644
--- a/scene/audio/event_player.h
+++ b/scene/audio/event_player.h
@@ -34,7 +34,7 @@
 #include "scene/resources/event_stream.h"
 class EventPlayer : public Node {
 
-	OBJ_TYPE(EventPlayer,Node);
+	GDCLASS(EventPlayer,Node);
 
 
 	enum {
diff --git a/scene/audio/sample_player.cpp b/scene/audio/sample_player.cpp
index 64992081f..ba2d37931 100644
--- a/scene/audio/sample_player.cpp
+++ b/scene/audio/sample_player.cpp
@@ -611,64 +611,64 @@ String SamplePlayer::get_configuration_warning() const {
 
 void SamplePlayer::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_sample_library","library:SampleLibrary"),&SamplePlayer::set_sample_library );
-	ObjectTypeDB::bind_method(_MD("get_sample_library:SampleLibrary"),&SamplePlayer::get_sample_library );
+	ClassDB::bind_method(_MD("set_sample_library","library:SampleLibrary"),&SamplePlayer::set_sample_library );
+	ClassDB::bind_method(_MD("get_sample_library:SampleLibrary"),&SamplePlayer::get_sample_library );
 
-	ObjectTypeDB::bind_method(_MD("set_polyphony","max_voices"),&SamplePlayer::set_polyphony );
-	ObjectTypeDB::bind_method(_MD("get_polyphony"),&SamplePlayer::get_polyphony );
+	ClassDB::bind_method(_MD("set_polyphony","max_voices"),&SamplePlayer::set_polyphony );
+	ClassDB::bind_method(_MD("get_polyphony"),&SamplePlayer::get_polyphony );
 
-	ObjectTypeDB::bind_method(_MD("play","name","unique"),&SamplePlayer::play, DEFVAL(false) );
-	ObjectTypeDB::bind_method(_MD("stop","voice"),&SamplePlayer::stop );
-	ObjectTypeDB::bind_method(_MD("stop_all"),&SamplePlayer::stop_all );
+	ClassDB::bind_method(_MD("play","name","unique"),&SamplePlayer::play, DEFVAL(false) );
+	ClassDB::bind_method(_MD("stop","voice"),&SamplePlayer::stop );
+	ClassDB::bind_method(_MD("stop_all"),&SamplePlayer::stop_all );
 
-	ObjectTypeDB::bind_method(_MD("set_mix_rate","voice","hz"),&SamplePlayer::set_mix_rate );
-	ObjectTypeDB::bind_method(_MD("set_pitch_scale","voice","ratio"),&SamplePlayer::set_pitch_scale );
-	ObjectTypeDB::bind_method(_MD("set_volume","voice","volume"),&SamplePlayer::set_volume );
-	ObjectTypeDB::bind_method(_MD("set_volume_db","voice","db"),&SamplePlayer::set_volume_db );
-	ObjectTypeDB::bind_method(_MD("set_pan","voice","pan","depth","height"),&SamplePlayer::set_pan,DEFVAL(0),DEFVAL(0) );
-	ObjectTypeDB::bind_method(_MD("set_filter","voice","type","cutoff_hz","resonance","gain"),&SamplePlayer::set_filter,DEFVAL(0) );
-	ObjectTypeDB::bind_method(_MD("set_chorus","voice","send"),&SamplePlayer::set_chorus );
-	ObjectTypeDB::bind_method(_MD("set_reverb","voice","room_type","send"),&SamplePlayer::set_reverb );
+	ClassDB::bind_method(_MD("set_mix_rate","voice","hz"),&SamplePlayer::set_mix_rate );
+	ClassDB::bind_method(_MD("set_pitch_scale","voice","ratio"),&SamplePlayer::set_pitch_scale );
+	ClassDB::bind_method(_MD("set_volume","voice","volume"),&SamplePlayer::set_volume );
+	ClassDB::bind_method(_MD("set_volume_db","voice","db"),&SamplePlayer::set_volume_db );
+	ClassDB::bind_method(_MD("set_pan","voice","pan","depth","height"),&SamplePlayer::set_pan,DEFVAL(0),DEFVAL(0) );
+	ClassDB::bind_method(_MD("set_filter","voice","type","cutoff_hz","resonance","gain"),&SamplePlayer::set_filter,DEFVAL(0) );
+	ClassDB::bind_method(_MD("set_chorus","voice","send"),&SamplePlayer::set_chorus );
+	ClassDB::bind_method(_MD("set_reverb","voice","room_type","send"),&SamplePlayer::set_reverb );
 
-	ObjectTypeDB::bind_method(_MD("get_mix_rate","voice"),&SamplePlayer::get_mix_rate );
-	ObjectTypeDB::bind_method(_MD("get_pitch_scale","voice"),&SamplePlayer::get_pitch_scale );
-	ObjectTypeDB::bind_method(_MD("get_volume","voice"),&SamplePlayer::get_volume );
-	ObjectTypeDB::bind_method(_MD("get_volume_db","voice"),&SamplePlayer::get_volume_db );
-	ObjectTypeDB::bind_method(_MD("get_pan","voice"),&SamplePlayer::get_pan );
-	ObjectTypeDB::bind_method(_MD("get_pan_depth","voice"),&SamplePlayer::get_pan_depth );
-	ObjectTypeDB::bind_method(_MD("get_pan_height","voice"),&SamplePlayer::get_pan_height );
-	ObjectTypeDB::bind_method(_MD("get_filter_type","voice"),&SamplePlayer::get_filter_type );
-	ObjectTypeDB::bind_method(_MD("get_filter_cutoff","voice"),&SamplePlayer::get_filter_cutoff );
-	ObjectTypeDB::bind_method(_MD("get_filter_resonance","voice"),&SamplePlayer::get_filter_resonance );
-	ObjectTypeDB::bind_method(_MD("get_filter_gain","voice"),&SamplePlayer::get_filter_gain );
-	ObjectTypeDB::bind_method(_MD("get_chorus","voice"),&SamplePlayer::get_chorus );
-	ObjectTypeDB::bind_method(_MD("get_reverb_room","voice"),&SamplePlayer::get_reverb_room );
-	ObjectTypeDB::bind_method(_MD("get_reverb","voice"),&SamplePlayer::get_reverb );
+	ClassDB::bind_method(_MD("get_mix_rate","voice"),&SamplePlayer::get_mix_rate );
+	ClassDB::bind_method(_MD("get_pitch_scale","voice"),&SamplePlayer::get_pitch_scale );
+	ClassDB::bind_method(_MD("get_volume","voice"),&SamplePlayer::get_volume );
+	ClassDB::bind_method(_MD("get_volume_db","voice"),&SamplePlayer::get_volume_db );
+	ClassDB::bind_method(_MD("get_pan","voice"),&SamplePlayer::get_pan );
+	ClassDB::bind_method(_MD("get_pan_depth","voice"),&SamplePlayer::get_pan_depth );
+	ClassDB::bind_method(_MD("get_pan_height","voice"),&SamplePlayer::get_pan_height );
+	ClassDB::bind_method(_MD("get_filter_type","voice"),&SamplePlayer::get_filter_type );
+	ClassDB::bind_method(_MD("get_filter_cutoff","voice"),&SamplePlayer::get_filter_cutoff );
+	ClassDB::bind_method(_MD("get_filter_resonance","voice"),&SamplePlayer::get_filter_resonance );
+	ClassDB::bind_method(_MD("get_filter_gain","voice"),&SamplePlayer::get_filter_gain );
+	ClassDB::bind_method(_MD("get_chorus","voice"),&SamplePlayer::get_chorus );
+	ClassDB::bind_method(_MD("get_reverb_room","voice"),&SamplePlayer::get_reverb_room );
+	ClassDB::bind_method(_MD("get_reverb","voice"),&SamplePlayer::get_reverb );
 
-	ObjectTypeDB::bind_method(_MD("set_default_pitch_scale","ratio"),&SamplePlayer::set_default_pitch_scale );
-	ObjectTypeDB::bind_method(_MD("set_default_volume","volume"),&SamplePlayer::set_default_volume );
-	ObjectTypeDB::bind_method(_MD("set_default_volume_db","db"),&SamplePlayer::set_default_volume_db );
-	ObjectTypeDB::bind_method(_MD("set_default_pan","pan","depth","height"),&SamplePlayer::set_default_pan,DEFVAL(0),DEFVAL(0) );
-	ObjectTypeDB::bind_method(_MD("set_default_filter","type","cutoff_hz","resonance","gain"),&SamplePlayer::set_default_filter,DEFVAL(0) );
-	ObjectTypeDB::bind_method(_MD("set_default_chorus","send"),&SamplePlayer::set_default_chorus );
-	ObjectTypeDB::bind_method(_MD("set_default_reverb","room_type","send"),&SamplePlayer::set_default_reverb );
+	ClassDB::bind_method(_MD("set_default_pitch_scale","ratio"),&SamplePlayer::set_default_pitch_scale );
+	ClassDB::bind_method(_MD("set_default_volume","volume"),&SamplePlayer::set_default_volume );
+	ClassDB::bind_method(_MD("set_default_volume_db","db"),&SamplePlayer::set_default_volume_db );
+	ClassDB::bind_method(_MD("set_default_pan","pan","depth","height"),&SamplePlayer::set_default_pan,DEFVAL(0),DEFVAL(0) );
+	ClassDB::bind_method(_MD("set_default_filter","type","cutoff_hz","resonance","gain"),&SamplePlayer::set_default_filter,DEFVAL(0) );
+	ClassDB::bind_method(_MD("set_default_chorus","send"),&SamplePlayer::set_default_chorus );
+	ClassDB::bind_method(_MD("set_default_reverb","room_type","send"),&SamplePlayer::set_default_reverb );
 
-	ObjectTypeDB::bind_method(_MD("get_default_pitch_scale"),&SamplePlayer::get_default_pitch_scale );
-	ObjectTypeDB::bind_method(_MD("get_default_volume"),&SamplePlayer::get_default_volume );
-	ObjectTypeDB::bind_method(_MD("get_default_volume_db"),&SamplePlayer::get_default_volume_db );
-	ObjectTypeDB::bind_method(_MD("get_default_pan"),&SamplePlayer::get_default_pan );
-	ObjectTypeDB::bind_method(_MD("get_default_pan_depth"),&SamplePlayer::get_default_pan_depth );
-	ObjectTypeDB::bind_method(_MD("get_default_pan_height"),&SamplePlayer::get_default_pan_height );
-	ObjectTypeDB::bind_method(_MD("get_default_filter_type"),&SamplePlayer::get_default_filter_type );
-	ObjectTypeDB::bind_method(_MD("get_default_filter_cutoff"),&SamplePlayer::get_default_filter_cutoff );
-	ObjectTypeDB::bind_method(_MD("get_default_filter_resonance"),&SamplePlayer::get_default_filter_resonance );
-	ObjectTypeDB::bind_method(_MD("get_default_filter_gain"),&SamplePlayer::get_default_filter_gain );
-	ObjectTypeDB::bind_method(_MD("get_default_chorus"),&SamplePlayer::get_default_chorus );
-	ObjectTypeDB::bind_method(_MD("get_default_reverb_room"),&SamplePlayer::get_default_reverb_room );
-	ObjectTypeDB::bind_method(_MD("get_default_reverb"),&SamplePlayer::get_default_reverb );
+	ClassDB::bind_method(_MD("get_default_pitch_scale"),&SamplePlayer::get_default_pitch_scale );
+	ClassDB::bind_method(_MD("get_default_volume"),&SamplePlayer::get_default_volume );
+	ClassDB::bind_method(_MD("get_default_volume_db"),&SamplePlayer::get_default_volume_db );
+	ClassDB::bind_method(_MD("get_default_pan"),&SamplePlayer::get_default_pan );
+	ClassDB::bind_method(_MD("get_default_pan_depth"),&SamplePlayer::get_default_pan_depth );
+	ClassDB::bind_method(_MD("get_default_pan_height"),&SamplePlayer::get_default_pan_height );
+	ClassDB::bind_method(_MD("get_default_filter_type"),&SamplePlayer::get_default_filter_type );
+	ClassDB::bind_method(_MD("get_default_filter_cutoff"),&SamplePlayer::get_default_filter_cutoff );
+	ClassDB::bind_method(_MD("get_default_filter_resonance"),&SamplePlayer::get_default_filter_resonance );
+	ClassDB::bind_method(_MD("get_default_filter_gain"),&SamplePlayer::get_default_filter_gain );
+	ClassDB::bind_method(_MD("get_default_chorus"),&SamplePlayer::get_default_chorus );
+	ClassDB::bind_method(_MD("get_default_reverb_room"),&SamplePlayer::get_default_reverb_room );
+	ClassDB::bind_method(_MD("get_default_reverb"),&SamplePlayer::get_default_reverb );
 
-	ObjectTypeDB::bind_method(_MD("is_active"),&SamplePlayer::is_active );
-	ObjectTypeDB::bind_method(_MD("is_voice_active","voice"),&SamplePlayer::is_voice_active );
+	ClassDB::bind_method(_MD("is_active"),&SamplePlayer::is_active );
+	ClassDB::bind_method(_MD("is_voice_active","voice"),&SamplePlayer::is_voice_active );
 
 	BIND_CONSTANT( FILTER_NONE);
 	BIND_CONSTANT( FILTER_LOWPASS);
diff --git a/scene/audio/sample_player.h b/scene/audio/sample_player.h
index 19c373e8b..8c4e6418a 100644
--- a/scene/audio/sample_player.h
+++ b/scene/audio/sample_player.h
@@ -34,7 +34,7 @@
 
 class SamplePlayer : public Node {
 
-	OBJ_TYPE( SamplePlayer, Node );
+	GDCLASS( SamplePlayer, Node );
 	OBJ_CATEGORY("Audio Nodes");
 public:
 
diff --git a/scene/audio/sound_room_params.cpp b/scene/audio/sound_room_params.cpp
index 5b410bf03..d08bc5d6b 100644
--- a/scene/audio/sound_room_params.cpp
+++ b/scene/audio/sound_room_params.cpp
@@ -134,14 +134,14 @@ bool SoundRoomParams::is_forcing_params_to_all_sources() {
 
 void SoundRoomParams::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_param","param","value"),&SoundRoomParams::set_param );
-	ObjectTypeDB::bind_method(_MD("get_param","param"),&SoundRoomParams::get_param );
+	ClassDB::bind_method(_MD("set_param","param","value"),&SoundRoomParams::set_param );
+	ClassDB::bind_method(_MD("get_param","param"),&SoundRoomParams::get_param );
 
-	ObjectTypeDB::bind_method(_MD("set_reverb_mode","reverb_mode","value"),&SoundRoomParams::set_reverb_mode );
-	ObjectTypeDB::bind_method(_MD("get_reverb_mode","reverb_mode"),&SoundRoomParams::get_reverb_mode );
+	ClassDB::bind_method(_MD("set_reverb_mode","reverb_mode","value"),&SoundRoomParams::set_reverb_mode );
+	ClassDB::bind_method(_MD("get_reverb_mode","reverb_mode"),&SoundRoomParams::get_reverb_mode );
 
-	ObjectTypeDB::bind_method(_MD("set_force_params_to_all_sources","enabled"),&SoundRoomParams::set_force_params_to_all_sources );
-	ObjectTypeDB::bind_method(_MD("is_forcing_params_to_all_sources"),&SoundRoomParams::is_forcing_params_to_all_sources );
+	ClassDB::bind_method(_MD("set_force_params_to_all_sources","enabled"),&SoundRoomParams::set_force_params_to_all_sources );
+	ClassDB::bind_method(_MD("is_forcing_params_to_all_sources"),&SoundRoomParams::is_forcing_params_to_all_sources );
 
 
 	ADD_PROPERTY( PropertyInfo( Variant::INT, "reverb/mode", PROPERTY_HINT_ENUM, "Small,Medium,Large,Hall"), _SCS("set_reverb_mode"), _SCS("get_reverb_mode") );
diff --git a/scene/audio/sound_room_params.h b/scene/audio/sound_room_params.h
index be4e6c8c8..3cdffda65 100644
--- a/scene/audio/sound_room_params.h
+++ b/scene/audio/sound_room_params.h
@@ -38,7 +38,7 @@
 #include "scene/3d/room_instance.h"
 class SoundRoomParams : public Node {
 
-	OBJ_TYPE( SoundRoomParams, Node );
+	GDCLASS( SoundRoomParams, Node );
 public:
 
 	enum Params {
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp
index d2f1a9fd0..21d7fcb08 100644
--- a/scene/audio/stream_player.cpp
+++ b/scene/audio/stream_player.cpp
@@ -345,46 +345,46 @@ int StreamPlayer::get_buffering_msec() const{
 
 void StreamPlayer::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_stream","stream:AudioStream"),&StreamPlayer::set_stream);
-	ObjectTypeDB::bind_method(_MD("get_stream:AudioStream"),&StreamPlayer::get_stream);
+	ClassDB::bind_method(_MD("set_stream","stream:AudioStream"),&StreamPlayer::set_stream);
+	ClassDB::bind_method(_MD("get_stream:AudioStream"),&StreamPlayer::get_stream);
 
-	ObjectTypeDB::bind_method(_MD("play","offset"),&StreamPlayer::play,DEFVAL(0));
-	ObjectTypeDB::bind_method(_MD("stop"),&StreamPlayer::stop);
+	ClassDB::bind_method(_MD("play","offset"),&StreamPlayer::play,DEFVAL(0));
+	ClassDB::bind_method(_MD("stop"),&StreamPlayer::stop);
 
-	ObjectTypeDB::bind_method(_MD("is_playing"),&StreamPlayer::is_playing);
+	ClassDB::bind_method(_MD("is_playing"),&StreamPlayer::is_playing);
 
-	ObjectTypeDB::bind_method(_MD("set_paused","paused"),&StreamPlayer::set_paused);
-	ObjectTypeDB::bind_method(_MD("is_paused"),&StreamPlayer::is_paused);
+	ClassDB::bind_method(_MD("set_paused","paused"),&StreamPlayer::set_paused);
+	ClassDB::bind_method(_MD("is_paused"),&StreamPlayer::is_paused);
 
-	ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&StreamPlayer::set_loop);
-	ObjectTypeDB::bind_method(_MD("has_loop"),&StreamPlayer::has_loop);
+	ClassDB::bind_method(_MD("set_loop","enabled"),&StreamPlayer::set_loop);
+	ClassDB::bind_method(_MD("has_loop"),&StreamPlayer::has_loop);
 
-	ObjectTypeDB::bind_method(_MD("set_volume","volume"),&StreamPlayer::set_volume);
-	ObjectTypeDB::bind_method(_MD("get_volume"),&StreamPlayer::get_volume);
+	ClassDB::bind_method(_MD("set_volume","volume"),&StreamPlayer::set_volume);
+	ClassDB::bind_method(_MD("get_volume"),&StreamPlayer::get_volume);
 
-	ObjectTypeDB::bind_method(_MD("set_volume_db","db"),&StreamPlayer::set_volume_db);
-	ObjectTypeDB::bind_method(_MD("get_volume_db"),&StreamPlayer::get_volume_db);
+	ClassDB::bind_method(_MD("set_volume_db","db"),&StreamPlayer::set_volume_db);
+	ClassDB::bind_method(_MD("get_volume_db"),&StreamPlayer::get_volume_db);
 
-	ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&StreamPlayer::set_buffering_msec);
-	ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&StreamPlayer::get_buffering_msec);
+	ClassDB::bind_method(_MD("set_buffering_msec","msec"),&StreamPlayer::set_buffering_msec);
+	ClassDB::bind_method(_MD("get_buffering_msec"),&StreamPlayer::get_buffering_msec);
 
-	ObjectTypeDB::bind_method(_MD("set_loop_restart_time","secs"),&StreamPlayer::set_loop_restart_time);
-	ObjectTypeDB::bind_method(_MD("get_loop_restart_time"),&StreamPlayer::get_loop_restart_time);
+	ClassDB::bind_method(_MD("set_loop_restart_time","secs"),&StreamPlayer::set_loop_restart_time);
+	ClassDB::bind_method(_MD("get_loop_restart_time"),&StreamPlayer::get_loop_restart_time);
 
-	ObjectTypeDB::bind_method(_MD("get_stream_name"),&StreamPlayer::get_stream_name);
-	ObjectTypeDB::bind_method(_MD("get_loop_count"),&StreamPlayer::get_loop_count);
+	ClassDB::bind_method(_MD("get_stream_name"),&StreamPlayer::get_stream_name);
+	ClassDB::bind_method(_MD("get_loop_count"),&StreamPlayer::get_loop_count);
 
-	ObjectTypeDB::bind_method(_MD("get_pos"),&StreamPlayer::get_pos);
-	ObjectTypeDB::bind_method(_MD("seek_pos","time"),&StreamPlayer::seek_pos);
+	ClassDB::bind_method(_MD("get_pos"),&StreamPlayer::get_pos);
+	ClassDB::bind_method(_MD("seek_pos","time"),&StreamPlayer::seek_pos);
 
-	ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&StreamPlayer::set_autoplay);
-	ObjectTypeDB::bind_method(_MD("has_autoplay"),&StreamPlayer::has_autoplay);
+	ClassDB::bind_method(_MD("set_autoplay","enabled"),&StreamPlayer::set_autoplay);
+	ClassDB::bind_method(_MD("has_autoplay"),&StreamPlayer::has_autoplay);
 
-	ObjectTypeDB::bind_method(_MD("get_length"),&StreamPlayer::get_length);
+	ClassDB::bind_method(_MD("get_length"),&StreamPlayer::get_length);
 
-	ObjectTypeDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play);
-	ObjectTypeDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play);
-	ObjectTypeDB::bind_method(_MD("_do_stop"),&StreamPlayer::_do_stop);
+	ClassDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play);
+	ClassDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play);
+	ClassDB::bind_method(_MD("_do_stop"),&StreamPlayer::_do_stop);
 
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"), _SCS("set_stream"), _SCS("get_stream") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") );
diff --git a/scene/audio/stream_player.h b/scene/audio/stream_player.h
index 4e64d2b27..6031d86aa 100644
--- a/scene/audio/stream_player.h
+++ b/scene/audio/stream_player.h
@@ -35,7 +35,7 @@
 
 class StreamPlayer : public Node {
 
-	OBJ_TYPE(StreamPlayer,Node);
+	GDCLASS(StreamPlayer,Node);
 
 	//_THREAD_SAFE_CLASS_