diff --git a/scripts/interrogate.py b/scripts/interrogate.py
index 0fbd824..ecf0841 100644
--- a/scripts/interrogate.py
+++ b/scripts/interrogate.py
@@ -6,7 +6,7 @@
 """
 
 import sys
-from os import listdir, chdir
+from os import listdir, chdir, getenv
 from os.path import join, isfile, isdir
 
 from panda3d.core import PandaSystem
@@ -19,7 +19,8 @@
 
 
 # Parameters
-MODULE_NAME = sys.argv[1]
+MODULE_NAME = getenv( "MODULE_FQN", sys.argv[1] )
+LIB_NAME = sys.argv[1]
 VERBOSE_LVL = int(sys.argv[2])  # Assume the user did specify something valid
 
 
@@ -73,7 +74,7 @@ def interrogate():
     cmd += ["-oc", "interrogate_wrapper.cpp"]
     cmd += ["-od", "interrogate.in"]
     cmd += ["-module", MODULE_NAME]
-    cmd += ["-library", MODULE_NAME]
+    cmd += ["-library", LIB_NAME]
 
     if PandaSystem.get_major_version() > 1 or PandaSystem.get_minor_version() > 9:
         # Add nomangle option, but only for recent builds
@@ -120,7 +121,7 @@ def interrogate_module():
         cmd += ["-import", "panda3d.core"]
 
     cmd += ["-module", MODULE_NAME]
-    cmd += ["-library", MODULE_NAME]
+    cmd += ["-library", LIB_NAME]
     cmd += ["-oc", "interrogate_module.cpp"]
     cmd += ["interrogate.in"]