diff --git a/headers/os/support/String.h b/headers/os/support/String.h
index c4906319e5..05bfaad05a 100644
--- a/headers/os/support/String.h
+++ b/headers/os/support/String.h
@@ -49,7 +49,7 @@ public:
 			BString&		SetToChars(const BString& string, int32 charCount);
 			BString&		AdoptChars(BString& from, int32 charCount);
 			
-			BString&		SetToArguments(const char* format, ...);
+			BString&		SetToFormat(const char* format, ...);
 
 			// Substring copying
 			BString&		CopyInto(BString& into, int32 fromOffset,
diff --git a/src/kits/support/String.cpp b/src/kits/support/String.cpp
index 51918f4b3e..f4781987fe 100644
--- a/src/kits/support/String.cpp
+++ b/src/kits/support/String.cpp
@@ -425,7 +425,7 @@ BString::AdoptChars(BString& string, int32 charCount)
 
 
 BString&
-BString::SetToArguments(const char* format, ...)
+BString::SetToFormat(const char* format, ...)
 {
 	va_list arg;
 	va_start(arg, format);
@@ -433,7 +433,8 @@ BString::SetToArguments(const char* format, ...)
 	va_end(arg);
 	
 	if (bytes <= Length()) {
-		bytes = bytes < 0 ? 0 : bytes;
+		if (bytes < 0)
+			bytes = 0;
 		UnlockBuffer(bytes);
 	} else {
 		va_list arg2;