diff --git a/source/mod_discord.rb b/source/mod_discord.rb
index bf4dbd0..bf09698 100644
--- a/source/mod_discord.rb
+++ b/source/mod_discord.rb
@@ -1,5 +1,9 @@
 class Mod_Discord < Vrobot4::Module::Module
-   Vrobot4::Module.add_module_type self, "Discord", server: "Discord"
+   def self.type
+      "Discord"
+   end
+
+   Vrobot4::Module.add_module_type self, server: "Discord"
 
    def initialize info
       super
diff --git a/source/mod_doomrla.rb b/source/mod_doomrla.rb
index 14ed1da..0b42f7f 100644
--- a/source/mod_doomrla.rb
+++ b/source/mod_doomrla.rb
@@ -11,7 +11,11 @@ require 'json'
 # - BE PRAYING
 #
 class Mod_DoomRLA < Vrobot4::Module::Module
-   Vrobot4::Module.add_module_type self, "DoomRLA", server: "Discord"
+   def self.type
+      "DoomRLA"
+   end
+
+   Vrobot4::Module.add_module_type self, server: "Discord"
 
    AType = ["Melee", "Ranged", "Special"].freeze
    DType = ["Melee", "Bullet", "Fire", "Plasma",
diff --git a/source/mod_fun.rb b/source/mod_fun.rb
index e413553..0a2438d 100644
--- a/source/mod_fun.rb
+++ b/source/mod_fun.rb
@@ -2,7 +2,11 @@ require 'open-uri'
 require 'json'
 
 class Mod_Fun < Vrobot4::Module::Module
-   Vrobot4::Module.add_module_type self, "Fun"
+   def self.type
+      "Fun"
+   end
+
+   Vrobot4::Module.add_module_type self
 
    QDB = "http://greyserv.net/qdb"
 
diff --git a/source/mod_util.rb b/source/mod_util.rb
index 7896fab..1919420 100644
--- a/source/mod_util.rb
+++ b/source/mod_util.rb
@@ -1,5 +1,9 @@
 class Mod_Util < Vrobot4::Module::Module
-   Vrobot4::Module.add_module_type self, "Utilities"
+   def self.type
+      "Utilities"
+   end
+
+   Vrobot4::Module.add_module_type self
 
    def initialize info
       super
diff --git a/source/module.rb b/source/module.rb
index d90e0c1..594899f 100644
--- a/source/module.rb
+++ b/source/module.rb
@@ -90,13 +90,13 @@ module Vrobot4::Module
 
    @@module_types = {}
 
-   def self.add_module_type type, name, server: nil, servflags: nil
-      @@module_types[name] = {
+   def self.add_module_type type, server: nil, servflags: nil
+      @@module_types[type.type] = {
          type:      type,
          server:    server,
          servflags: servflags ? /[#{servflags}]/ : nil
       }
-      Vrobot4.log :INFO, "added module type:", name
+      Vrobot4.log :INFO, "added module type:", type.type
    end
 
    def self.get_module_type s