diff --git a/src/apps/debugger/settings/GUITeamUISettings.cpp b/src/apps/debugger/settings/GUITeamUISettings.cpp
index d1edf33f03..93941e83fa 100644
--- a/src/apps/debugger/settings/GUITeamUISettings.cpp
+++ b/src/apps/debugger/settings/GUITeamUISettings.cpp
@@ -97,18 +97,18 @@ GUITeamUISettings::Clone() const
 
 
 bool
-GUITeamUISettings::SetValue(const char* settingID, const BVariant& value)
+GUITeamUISettings::AddSettings(const char* settingID, const BMessage& data)
 {
 	fValues.RemoveName(settingID);
 
-	return value.AddToMessage(fValues, settingID) == B_OK;
+	return fValues.AddMessage(settingID, &data) == B_OK;
 }
 
 
 status_t
-GUITeamUISettings::Value(const char* settingID, BVariant &value) const
+GUITeamUISettings::Settings(const char* settingID, BMessage &data) const
 {
-	return value.SetFromMessage(fValues, settingID);
+	return fValues.FindMessage(settingID, &data);
 }
 
 
diff --git a/src/apps/debugger/settings/GUITeamUISettings.h b/src/apps/debugger/settings/GUITeamUISettings.h
index a7a74d1da0..dbf365ee8b 100644
--- a/src/apps/debugger/settings/GUITeamUISettings.h
+++ b/src/apps/debugger/settings/GUITeamUISettings.h
@@ -30,10 +30,10 @@ public:
 	virtual	status_t			WriteTo(BMessage& archive) const;
 	virtual TeamUISettings*		Clone() const;
 
-			bool				SetValue(const char* settingID,
-									const BVariant& value);
-			status_t			Value(const char* settingID,
-									BVariant& value) const;
+			bool				AddSettings(const char* settingID,
+									const BMessage& data);
+			status_t			Settings(const char* settingID,
+									BMessage& data) const;
 
 			const BMessage&		Values() const;