diff --git a/headers/os/locale/Country.h b/headers/os/locale/Country.h
index a1473c7137..cb8a8b1de7 100644
--- a/headers/os/locale/Country.h
+++ b/headers/os/locale/Country.h
@@ -41,8 +41,8 @@ class BCountry {
 		BCountry& operator=(const BCountry& other);
 		virtual 		~BCountry();
 
-		bool 			Name(BString&) const;
-		bool			LocaleName(BString&) const;
+		bool 			Name(BString& name) const;
+		bool			LocaleName(BString& name) const;
 		const char*		Code() const;
 		status_t		GetIcon(BBitmap* result);
 
diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp
index 99e6fe515e..1b1220e2f5 100644
--- a/src/kits/locale/Country.cpp
+++ b/src/kits/locale/Country.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2009, Axel Dörfler, axeld@pinc-software.de.
- * Copyright 2009, Destugues, pulkomandy@gmail.com.
+ * Copyright 2009-2010, Adrien Destugues, pulkomandy@gmail.com.
  * Distributed under the terms of the MIT License.
  */
 
@@ -63,7 +63,8 @@ BCountry::BCountry(const BCountry& other)
 {
 	fICULocale = new ICU_VERSION::Locale(*other.fICULocale);
 
-	// We could copy these, but we can recreate them when needed from the locale anyway
+	// We could copy these, but we can recreate them when needed from the locale
+	// anyway
 	fICULongDateFormatter = NULL;
 	fICUShortDateFormatter = NULL;
 	fICULongTimeFormatter = NULL;
@@ -107,7 +108,8 @@ BCountry::operator=(const BCountry& other)
 
 	fICULocale = new ICU_VERSION::Locale(*other.fICULocale);
 
-	// We could copy these, but we can recreate them when needed from the locale anyway
+	// We could copy these, but we can recreate them when needed from the locale
+	// anyway
 	fICULongDateFormatter = NULL;
 	fICUShortDateFormatter = NULL;
 	fICULongTimeFormatter = NULL;