diff --git a/bazaar/GoogleTestExample/StringTest.cpp b/bazaar/GoogleTestExample/StringTest.cpp
index 0cc35be7f..958be712d 100644
--- a/bazaar/GoogleTestExample/StringTest.cpp
+++ b/bazaar/GoogleTestExample/StringTest.cpp
@@ -1,6 +1,6 @@
 #include "StringTest.h"
 
-NAMESPACE_UPP
+namespace Upp {
 
 void StringTest::SetUp()
 {
@@ -48,4 +48,4 @@ TEST_F(StringTest, TestEqual)
 	ASSERT_FALSE(sCat.IsEqual(sDog));
 }
 
-END_UPP_NAMESPACE
+}
diff --git a/bazaar/GoogleTestExample/StringTest.h b/bazaar/GoogleTestExample/StringTest.h
index 58370d0ae..41ce1e57f 100644
--- a/bazaar/GoogleTestExample/StringTest.h
+++ b/bazaar/GoogleTestExample/StringTest.h
@@ -4,18 +4,18 @@
 #include <Core/Core.h>
 #include <plugin/gtest/gtest.h>
 
-NAMESPACE_UPP
+namespace Upp {
 
-class StringTest : public testing::Test {
-protected:
-	virtual void SetUp();
-	
-protected:
-	String sEmpty;
-	String sCat;
-	String sDog;
-};
+	class StringTest : public testing::Test {
+	protected:
+		virtual void SetUp() override;
+		
+	protected:
+		String sEmpty;
+		String sCat;
+		String sDog;
+	};
 
-END_UPP_NAMESPACE
+}
 
 #endif