diff --git a/src/main/java/in/nosd/redis/RedisLookupPlugin.java b/src/main/java/in/nosd/redis/RedisLookupPlugin.java
index 445e1cd..0fb6ba4 100644
--- a/src/main/java/in/nosd/redis/RedisLookupPlugin.java
+++ b/src/main/java/in/nosd/redis/RedisLookupPlugin.java
@@ -30,11 +30,11 @@ import java.util.Collections;
 public class RedisLookupPlugin implements Plugin {
     @Override
     public PluginMetaData metadata() {
-        return new RedisLookupPluginMetaData();
+        return new RedisLookupMetaData();
     }
 
     @Override
     public Collection<PluginModule> modules () {
-        return Collections.<PluginModule>singletonList(new RedisLookupPluginModule());
+        return Collections.<PluginModule>singletonList(new RedisLookupModule());
     }
 }
diff --git a/src/main/resources/META-INF/services/org.graylog2.plugin.Plugin b/src/main/resources/META-INF/services/org.graylog2.plugin.Plugin
index fc5353a..3e007d5 100644
--- a/src/main/resources/META-INF/services/org.graylog2.plugin.Plugin
+++ b/src/main/resources/META-INF/services/org.graylog2.plugin.Plugin
@@ -1 +1 @@
-in.nosd.redis.RedisLookupPluginPlugin
\ No newline at end of file
+in.nosd.redis.RedisLookupPlugin
diff --git a/webpack.config.js b/webpack.config.js
index 68204aa..6859b4b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,6 +19,6 @@ const { PluginWebpackConfig } = require('graylog-web-plugin');
 const { loadBuildConfig } = require('graylog-web-plugin');
 
 // Remember to use the same name here and in `getUniqueId()` in the java MetaData class
-module.exports = new PluginWebpackConfig(__dirname, 'in.nosd.redis.RedisLookupPluginPlugin', loadBuildConfig(path.resolve(__dirname, './build.config')), {
+module.exports = new PluginWebpackConfig(__dirname, 'in.nosd.redis.RedisLookupPlugin', loadBuildConfig(path.resolve(__dirname, './build.config')), {
   // Here goes your additional webpack configuration.
 });