diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc
index 4521515..9eac2f2 100644
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -151,7 +151,7 @@
   std::string type_to_spec_args(t_type* ttype);
 
   static std::string get_real_py_module(const t_program* program) {
-    std::string real_module = program->get_py_module();
+    std::string real_module = program->get_namespace("py");
     if (real_module.empty()) {
       return program->get_name();
     }
diff --git a/compiler/cpp/src/parse/t_program.h b/compiler/cpp/src/parse/t_program.h
index bcb3967..6dcba86 100644
--- a/compiler/cpp/src/parse/t_program.h
+++ b/compiler/cpp/src/parse/t_program.h
@@ -192,14 +192,6 @@
     return ruby_namespace_;
   }
 
-  void set_py_module(std::string py_module) {
-    py_module_ = py_module;
-  }
-
-  const std::string& get_py_module() const {
-    return py_module_;
-  }
-
   void set_perl_package(std::string perl_package) {
     perl_package_ = perl_package;
   }
@@ -255,9 +247,6 @@
   // Ruby namespace
   std::string ruby_namespace_;
 
-  // Python namespace
-  std::string py_module_;
-
   // Perl namespace
   std::string perl_package_;
 
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 81c7360..53c6d81 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -277,11 +277,13 @@
         g_program->set_php_namespace($2);
       }
     }
+/* TODO(dreiss): Get rid of this once everyone is using the new hotness. */
 | tok_py_module tok_identifier
     {
+      pwarning(1, "'py_module' is deprecated. Use 'namespace py' instead");
       pdebug("Header -> tok_py_module tok_identifier");
       if (g_parse_mode == PROGRAM) {
-        g_program->set_py_module($2);
+        g_program->set_namespace("py", $2);
       }
     }
 | tok_perl_package tok_identifier