diff --git a/red/api/index.js b/red/api/index.js
index c2d3bcbdb..14aabc881 100644
--- a/red/api/index.js
+++ b/red/api/index.js
@@ -19,7 +19,7 @@ var util = require('util');
 
 var ui = require("./ui");
 var nodes = require("./nodes");
-var modules = require("./modules");
+var plugins = require("./plugins");
 var flows = require("./flows");
 var library = require("./library");
 
@@ -56,9 +56,9 @@ function init(adminApp) {
     adminApp.put("/nodes/:id",nodes.put);
     adminApp.delete("/nodes/:id",nodes.delete);
 
-    // Modules
-    adminApp.get("/modules",modules.getAll);
-    adminApp.get("/modules/:id",modules.get);
+    // Plugins
+    adminApp.get("/plugins",plugins.getAll);
+    adminApp.get("/plugins/:id",plugins.get);
 
     // Library
     adminApp.post(new RegExp("/library/flows\/(.*)"),library.post);
diff --git a/red/api/modules.js b/red/api/plugins.js
similarity index 90%
rename from red/api/modules.js
rename to red/api/plugins.js
index 426157941..bac6cfb4c 100644
--- a/red/api/modules.js
+++ b/red/api/plugins.js
@@ -18,11 +18,11 @@ var redNodes = require("../nodes");
 
 module.exports = {
     getAll: function(req,res) {
-        res.json(redNodes.getModuleList());
+        res.json(redNodes.getPluginList());
     },
     get: function(req,res) {
         var id = req.params.id;
-        var result = redNodes.getModule(id);
+        var result = redNodes.getPluginInfo(id);
         if (result) {
             res.send(result);
         } else {
diff --git a/red/nodes/index.js b/red/nodes/index.js
index 4567280d4..a5ad0b6bd 100644
--- a/red/nodes/index.js
+++ b/red/nodes/index.js
@@ -114,9 +114,9 @@ module.exports = {
     getType: registry.get,
     getNodeInfo: registry.getNodeInfo,
     getNodeModuleInfo: registry.getNodeModuleInfo,
-    getModule: registry.getModule,
+    getPluginInfo: registry.getPluginInfo,
     getNodeList: registry.getNodeList,
-    getModuleList: registry.getModuleList,
+    getPluginList: registry.getPluginList,
     getNodeConfigs: registry.getNodeConfigs,
     getNodeConfig: registry.getNodeConfig,
     clearRegistry: registry.clear,
diff --git a/red/nodes/registry.js b/red/nodes/registry.js
index 82c069ea5..a6b3b4ba9 100644
--- a/red/nodes/registry.js
+++ b/red/nodes/registry.js
@@ -33,7 +33,7 @@ function filterNodeInfo(n) {
         name: n.name,
         types: n.types,
         enabled: n.enabled
-    }
+    };
     if (n.hasOwnProperty("loaded")) {
         r.loaded = n.loaded;
     }
@@ -164,13 +164,13 @@ var registry = (function() {
             }
             return list;
         },
-        getModuleList: function() {
+        getPluginList: function() {
             var list = [];
-            for (var module in nodeModules) {
-                if (nodeModules.hasOwnProperty(module)) {
-                    var nodes = nodeModules[module].nodes;
+            for (var plugin in nodeModules) {
+                if (nodeModules.hasOwnProperty(plugin)) {
+                    var nodes = nodeModules[plugin].nodes;
                     var m = {
-                        name: module,
+                        name: plugin,
                         nodes: []
                     };
                     for (var i = 0; i < nodes.length; ++i) {
@@ -181,10 +181,10 @@ var registry = (function() {
             }
             return list;
         },
-        getModule: function(module) {
-            var nodes = nodeModules[module].nodes;
+        getPluginInfo: function(plugin) {
+            var nodes = nodeModules[plugin].nodes;
             var m = {
-                name: module,
+                name: plugin,
                 nodes: []
             };
             for (var i = 0; i < nodes.length; ++i) {
@@ -329,7 +329,7 @@ var registry = (function() {
                 saveNodeList();
             }
         }
-    }
+    };
 })();
 
 
@@ -368,7 +368,7 @@ function getNodeFiles(dir) {
                         }
                     }
                 }
-                valid = valid && fs.existsSync(path.join(dir,fn.replace(/\.js$/,".html")))
+                valid = valid && fs.existsSync(path.join(dir,fn.replace(/\.js$/,".html")));
 
                 if (valid) {
                     result.push(path.join(dir,fn));
@@ -505,13 +505,13 @@ function loadNodeConfig(file,module,name) {
         template: file.replace(/\.js$/,".html"),
         enabled: isEnabled,
         loaded:false
-    }
+    };
 
     if (module) {
         node.name = module+":"+name;
         node.module = module;
     } else {
-        node.name = path.basename(file)
+        node.name = path.basename(file);
     }
     try {
         var content = fs.readFileSync(node.template,'utf8');
@@ -717,9 +717,9 @@ module.exports = {
     get: registry.getNodeConstructor,
     getNodeInfo: registry.getNodeInfo,
     getNodeModuleInfo: registry.getModuleInfo,
-    getModule: registry.getModule,
+    getPluginInfo: registry.getPluginInfo,
     getNodeList: registry.getNodeList,
-    getModuleList: registry.getModuleList,
+    getPluginList: registry.getPluginList,
     getNodeConfigs: registry.getAllNodeConfigs,
     getNodeConfig: registry.getNodeConfig,
     addNode: addNode,
@@ -730,4 +730,4 @@ module.exports = {
     addModule: addModule,
     removeModule: registry.removeModule,
     cleanNodeList: registry.cleanNodeList
-}
+};