diff --git a/src/main/java/in/nosd/redis/RedisLookupPluginMetaData.java b/src/main/java/in/nosd/redis/RedisLookupMetaData.java
similarity index 91%
rename from src/main/java/in/nosd/redis/RedisLookupPluginMetaData.java
rename to src/main/java/in/nosd/redis/RedisLookupMetaData.java
index 1d4234b..5057bdc 100644
--- a/src/main/java/in/nosd/redis/RedisLookupPluginMetaData.java
+++ b/src/main/java/in/nosd/redis/RedisLookupMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 johan@nosd.in
+ * Copyright (C) 2020 johan@nosd.in
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Server Side Public License, version 1,
@@ -27,17 +27,17 @@ import java.util.Set;
 /**
  * Implement the PluginMetaData interface here.
  */
-public class RedisLookupPluginMetaData implements PluginMetaData {
+public class RedisLookupMetaData implements PluginMetaData {
     private static final String PLUGIN_PROPERTIES = "in.nosd.redis.graylog-plugin-redis-lookup/graylog-plugin.properties";
 
     @Override
     public String getUniqueId() {
-        return "in.nosd.redis.RedisLookupPluginPlugin";
+        return "in.nosd.redis.RedisLookupPlugin";
     }
 
     @Override
     public String getName() {
-        return "RedisLookupPlugin";
+        return "Redis Lookup";
     }
 
     @Override
diff --git a/src/main/java/in/nosd/redis/RedisLookupPluginModule.java b/src/main/java/in/nosd/redis/RedisLookupModule.java
similarity index 91%
rename from src/main/java/in/nosd/redis/RedisLookupPluginModule.java
rename to src/main/java/in/nosd/redis/RedisLookupModule.java
index 828f7de..af208aa 100644
--- a/src/main/java/in/nosd/redis/RedisLookupPluginModule.java
+++ b/src/main/java/in/nosd/redis/RedisLookupModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 johan@nosd.in
+ * Copyright (C) 2020 johan@nosd.in
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Server Side Public License, version 1,
@@ -16,14 +16,15 @@
  */
 package in.nosd.redis;
 
-import com.google.inject.Binder;
-import com.google.inject.TypeLiteral;
-import com.google.inject.multibindings.MapBinder;
 
 import org.graylog.plugins.pipelineprocessor.ast.functions.Function;
 import org.graylog2.plugin.PluginConfigBean;
 import org.graylog2.plugin.PluginModule;
 
+import com.google.inject.multibindings.MapBinder;
+import com.google.inject.Binder;
+import com.google.inject.TypeLiteral;
+
 import in.nosd.redis.dataadapters.RedisLookupDataAdapter;
 import in.nosd.redis.functions.RedisLookupPluginFunction;
 
@@ -33,7 +34,7 @@ import java.util.Set;
 /**
  * Extend the PluginModule abstract class here to add you plugin to the system.
  */
-public class RedisLookupPluginModule extends PluginModule {
+public class RedisLookupModule extends PluginModule {
     /**
      * Returns all configuration beans required by this plugin.
      *
@@ -55,7 +56,7 @@ public class RedisLookupPluginModule extends PluginModule {
          * addMessageFilter(Class<? extends MessageFilter>);
          * addMessageOutput(Class<? extends MessageOutput>);
          * addPeriodical(Class<? extends Periodical>);
-         * addAlarmCallback(Class<? extends AlarmCallback>);
+         // * addAlarmCallback(Class<? extends AlarmCallback>);
          * addInitializer(Class<? extends Service>);
          * addRestResource(Class<? extends PluginRestResource>);
          *
@@ -64,12 +65,12 @@ public class RedisLookupPluginModule extends PluginModule {
          *
          * addConfigBeans();
          */
-         
-         addMessageProcessorFunction(RedisLookupPluginFunction.NAME, RedisLookupPluginFunction.class);
+
+        addMessageProcessorFunction(RedisLookupPluginFunction.NAME, RedisLookupPluginFunction.class);
 
         installLookupDataAdapter2(RedisLookupDataAdapter.NAME, RedisLookupDataAdapter.class, 
             RedisLookupDataAdapter.Factory.class, RedisLookupDataAdapter.Config.class);
-           
+
         addConfigBeans();
     }
     
diff --git a/src/main/java/in/nosd/redis/RedisLookupPluginPlugin.java b/src/main/java/in/nosd/redis/RedisLookupPluginPlugin.java
deleted file mode 100644
index 719cc7a..0000000
--- a/src/main/java/in/nosd/redis/RedisLookupPluginPlugin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2024 johan@nosd.in
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- */
-package in.nosd.redis;
-
-import org.graylog2.plugin.Plugin;
-import org.graylog2.plugin.PluginMetaData;
-import org.graylog2.plugin.PluginModule;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Implement the Plugin interface here.
- */
-public class RedisLookupPluginPlugin implements Plugin {
-    @Override
-    public PluginMetaData metadata() {
-        return new RedisLookupPluginMetaData();
-    }
-
-    @Override
-    public Collection<PluginModule> modules () {
-        return Collections.<PluginModule>singletonList(new RedisLookupPluginModule());
-    }
-}