diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index c104a81..7bd189f 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -247,12 +247,11 @@
     {
       pdebug("Header -> Include");
     }
-| tok_namespace tok_identifier
+| tok_namespace tok_identifier tok_identifier
     {
-      pwarning(1, "'namespace' is deprecated. Use 'cpp_namespace' and/or 'java_package' instead");
+      pdebug("Header -> tok_namespace tok_identifier tok_identifier");
       if (g_parse_mode == PROGRAM) {
-        g_program->set_cpp_namespace($2);
-        g_program->set_java_package($2);
+        g_program->set_namespace($2, $3);
       }
     }
 | tok_cpp_namespace tok_identifier