diff --git a/linspector/processors/__init__.py b/linspector/processors/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/linspector/processors/processor.py b/linspector/processors/processor.py
deleted file mode 100644
index 1621148..0000000
--- a/linspector/processors/processor.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-The processor class for postprocessing polled data.
-
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
-
-This file is part of Linspector (http://linspector.org).
-
-Linspector is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from logging import getLogger
-
-logger = getLogger(__name__)
-
-
-class Processor:
-    def __init__(self, **kwargs):
-        pass
\ No newline at end of file
diff --git a/linspector/processors/mariadb.py b/linspector/tasks/mariadb.py
similarity index 76%
rename from linspector/processors/mariadb.py
rename to linspector/tasks/mariadb.py
index e400ce2..8965648 100644
--- a/linspector/processors/mariadb.py
+++ b/linspector/tasks/mariadb.py
@@ -1,7 +1,7 @@
 """
-The MariaDB processor
+The MariaDB task
 
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
+Copyright (c) 2011-2013 by Johannes Findeisen and Rafael Timmerberg
 
 This file is part of Linspector (http://linspector.org).
 
@@ -20,15 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import getLogger
-from linspector.processors.processor import Processor
+
+from linspector.tasks.task import Task
 
 logger = getLogger(__name__)
 
 
-class MariadbProcessor(Processor):
+class MariadbTask(Task):
     def __init__(self, **kwargs):
-        Processor.__init__(self, **kwargs)
+        pass
 
 
 def create(kwargs):
-    return MariadbProcessor(**kwargs)
\ No newline at end of file
+    return MariadbTask(**kwargs)
\ No newline at end of file
diff --git a/linspector/processors/mongodb.py b/linspector/tasks/mongodb.py
similarity index 76%
rename from linspector/processors/mongodb.py
rename to linspector/tasks/mongodb.py
index 9958f4c..0ed8b40 100644
--- a/linspector/processors/mongodb.py
+++ b/linspector/tasks/mongodb.py
@@ -1,7 +1,7 @@
 """
-The MongoDB processor
+The MongoDB task
 
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
+Copyright (c) 2011-2013 by Johannes Findeisen and Rafael Timmerberg
 
 This file is part of Linspector (http://linspector.org).
 
@@ -20,15 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import getLogger
-from linspector.processors.processor import Processor
+
+from linspector.tasks.task import Task
 
 logger = getLogger(__name__)
 
 
-class MongodbProcessor(Processor):
+class MongodbTask(Task):
     def __init__(self, **kwargs):
-        Processor.__init__(self, **kwargs)
+        pass
 
 
 def create(kwargs):
-    return MongodbProcessor(**kwargs)
\ No newline at end of file
+    return MongodbTask(**kwargs)
\ No newline at end of file
diff --git a/linspector/processors/syslog.py b/linspector/tasks/syslog.py
similarity index 76%
rename from linspector/processors/syslog.py
rename to linspector/tasks/syslog.py
index ad2c062..1aabc13 100644
--- a/linspector/processors/syslog.py
+++ b/linspector/tasks/syslog.py
@@ -1,7 +1,7 @@
 """
-The syslog processor
+The syslog task
 
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
+Copyright (c) 2011-2013 by Johannes Findeisen and Rafael Timmerberg
 
 This file is part of Linspector (http://linspector.org).
 
@@ -20,15 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import getLogger
-from linspector.processors.processor import Processor
+
+from linspector.tasks.task import Task
 
 logger = getLogger(__name__)
 
 
-class SyslogProcessor(Processor):
+class SyslogTask(Task):
     def __init__(self, **kwargs):
-        Processor.__init__(self, **kwargs)
+        pass
 
 
 def create(kwargs):
-    return SyslogProcessor(**kwargs)
\ No newline at end of file
+    return SyslogTask(**kwargs)
\ No newline at end of file