6 files changed, 6 insertions, 41 deletions
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index f48fe9590..6a2af8e5a 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-%module core
+%module(package="m5.internal") core
 
 %{
 #include "python/swig/pyobject.hh"
@@ -85,8 +85,3 @@ bool want_warn, warn_verbose;
 bool want_info, info_verbose;
 bool want_hack, hack_verbose;
 
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._core"
-%}
diff --git a/src/python/swig/debug.i b/src/python/swig/debug.i
index b7fdb2171..44733eef7 100644
--- a/src/python/swig/debug.i
+++ b/src/python/swig/debug.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module debug
+%module(package="m5.internal") debug
 
 %{
 #include "base/types.hh"
@@ -38,9 +38,3 @@
 %include "stdint.i"
 %include "base/types.hh"
 %include "sim/debug.hh"
-
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._debug"
-%}
diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index 1e3b26a96..9ffea8dc1 100644
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module event
+%module(package="m5.internal") event
 
 %{
 #include "base/types.hh"
@@ -102,9 +102,3 @@ class SimLoopExitEvent : public Event
 }
 SimLoopExitEvent *simulate(Tick num_cycles = MaxTick);
 void exitSimLoop(const std::string &message, int exit_code);
-
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._event"
-%}
diff --git a/src/python/swig/random.i b/src/python/swig/random.i
index d9ea2a404..cf64654ea 100644
--- a/src/python/swig/random.i
+++ b/src/python/swig/random.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module random
+%module(package="m5.internal") random
 
 %include "stdint.i"
 
@@ -47,9 +47,3 @@ seed(uint64_t seed)
 %inline %{
 extern void seed(uint64_t seed);
 %}
-
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._random"
-%}
diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index fe10b358f..3775976e8 100644
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module stats
+%module(package="m5.internal") stats
 
 %include "std_list.i"
 %include "std_string.i"
@@ -60,9 +60,3 @@ void reset();
 std::list<Info *> &statsList();
 
 /* namespace Stats */ }
-
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._stats"
-%}
diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 57ab3d3ec..5407b687f 100644
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module trace
+%module(package="m5.internal") trace
 
 %{
 #include "base/trace.hh"
@@ -68,9 +68,3 @@ extern void clear(const char *string);
 extern void ignore(const char *expr);
 extern bool enabled;
 %}
-
-%wrapper %{
-// fix up module name to reflect the fact that it's inside the m5 package
-#undef SWIG_name
-#define SWIG_name "m5.internal._trace"
-%}