diff --git a/etc/icinga2/features-available/icingadb.conf b/etc/icinga2/features-available/icingadb.conf
new file mode 100644
index 000000000..9fe55ec8e
--- /dev/null
+++ b/etc/icinga2/features-available/icingadb.conf
@@ -0,0 +1,5 @@
+object IcingaDB "icingadb" {
+  //host = "127.0.0.1"
+  //port = 6379
+  //password = "xxx"
+}
diff --git a/etc/icinga2/features-available/redis.conf b/etc/icinga2/features-available/redis.conf
deleted file mode 100644
index 4be873ef3..000000000
--- a/etc/icinga2/features-available/redis.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * The redis library implements functionality for putting Icinga
- * event data into a redis database.
- *
- * NOTE: This is experimental and may change without further notice.
- */
-
-library "redis"
-
-object IcingaDB "redis" {
-  //host = "127.0.0.1"
-  //port = 6379
-  //password = "xxx"
-}
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index 0ba780316..db8daae30 100644
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -54,7 +54,7 @@ if(ICINGA2_WITH_PERFDATA)
 endif()
 
 if(ICINGA2_WITH_REDIS)
-  list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:redis>)
+  list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:icingadb>)
 endif()
 
 add_executable(icinga-app
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a00cf4db8..c3baa2755 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -54,7 +54,7 @@ if(ICINGA2_WITH_PERFDATA)
 endif()
 
 if(ICINGA2_WITH_REDIS)
-  add_subdirectory(redis)
+  add_subdirectory(icingadb)
 endif()
 
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
diff --git a/lib/redis/CMakeLists.txt b/lib/icingadb/CMakeLists.txt
similarity index 71%
rename from lib/redis/CMakeLists.txt
rename to lib/icingadb/CMakeLists.txt
index bb00ca343..a2ece0054 100644
--- a/lib/redis/CMakeLists.txt
+++ b/lib/icingadb/CMakeLists.txt
@@ -15,29 +15,29 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(rediswriter.ti rediswriter-ti.cpp rediswriter-ti.hpp)
+mkclass_target(icingadb.ti icingadb-ti.cpp icingadb-ti.hpp)
 
-set(redis_SOURCES
-  rediswriter.cpp rediswriter-objects.cpp rediswriter-stats.cpp rediswriter-utility.cpp redisconnection.cpp rediswriter-ti.hpp
+set(icingadb_SOURCES
+  icingadb.cpp icingadb-objects.cpp icingadb-stats.cpp icingadb-utility.cpp redisconnection.cpp icingadb-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
-    mkunity_target(redis redis redis_SOURCES)
+    mkunity_target(icingadb icingadb icingadb_SOURCES)
 endif()
 
-add_library(redis OBJECT ${redis_SOURCES})
+add_library(icingadb OBJECT ${icingadb_SOURCES})
 
 include_directories(${icinga2_SOURCE_DIR}/third-party)
 
-add_dependencies(redis base config icinga remote)
+add_dependencies(icingadb base config icinga remote)
 
 set_target_properties (
-  redis PROPERTIES
+  icingadb PROPERTIES
   FOLDER Components
 )
 
 install_if_not_exists(
-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/redis.conf
+  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf
   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
 )
 
diff --git a/lib/redis/rediswriter-objects.cpp b/lib/icingadb/icingadb-objects.cpp
similarity index 99%
rename from lib/redis/rediswriter-objects.cpp
rename to lib/icingadb/icingadb-objects.cpp
index b6f9424f4..e7ddc90da 100644
--- a/lib/redis/rediswriter-objects.cpp
+++ b/lib/icingadb/icingadb-objects.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "redis/rediswriter.hpp"
-#include "redis/redisconnection.hpp"
+#include "icingadb/icingadb.hpp"
+#include "icingadb/redisconnection.hpp"
 #include "icinga/command.hpp"
 #include "icinga/compatutility.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/redis/rediswriter-stats.cpp b/lib/icingadb/icingadb-stats.cpp
similarity index 98%
rename from lib/redis/rediswriter-stats.cpp
rename to lib/icingadb/icingadb-stats.cpp
index d007aeb66..ea1dcecf0 100644
--- a/lib/redis/rediswriter-stats.cpp
+++ b/lib/icingadb/icingadb-stats.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "redis/rediswriter.hpp"
+#include "icingadb/icingadb.hpp"
 #include "base/json.hpp"
 #include "base/logger.hpp"
 #include "base/serializer.hpp"
diff --git a/lib/redis/rediswriter-utility.cpp b/lib/icingadb/icingadb-utility.cpp
similarity index 99%
rename from lib/redis/rediswriter-utility.cpp
rename to lib/icingadb/icingadb-utility.cpp
index 0a687f772..dbf3f7a6e 100644
--- a/lib/redis/rediswriter-utility.cpp
+++ b/lib/icingadb/icingadb-utility.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "redis/rediswriter.hpp"
+#include "icingadb/icingadb.hpp"
 #include "icinga/customvarobject.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/notificationcommand.hpp"
diff --git a/lib/redis/rediswriter.cpp b/lib/icingadb/icingadb.cpp
similarity index 98%
rename from lib/redis/rediswriter.cpp
rename to lib/icingadb/icingadb.cpp
index 6b3677cdd..020788682 100644
--- a/lib/redis/rediswriter.cpp
+++ b/lib/icingadb/icingadb.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "redis/rediswriter.hpp"
-#include "redis/rediswriter-ti.cpp"
-#include "redis/redisconnection.hpp"
+#include "icingadb/icingadb.hpp"
+#include "icingadb/icingadb-ti.cpp"
+#include "icingadb/redisconnection.hpp"
 #include "remote/eventqueue.hpp"
 #include "base/json.hpp"
 #include "icinga/checkable.hpp"
diff --git a/lib/redis/rediswriter.hpp b/lib/icingadb/icingadb.hpp
similarity index 98%
rename from lib/redis/rediswriter.hpp
rename to lib/icingadb/icingadb.hpp
index 597d2fcc6..5437422c5 100644
--- a/lib/redis/rediswriter.hpp
+++ b/lib/icingadb/icingadb.hpp
@@ -20,12 +20,12 @@
 #ifndef REDISWRITER_H
 #define REDISWRITER_H
 
-#include "redis/rediswriter-ti.hpp"
+#include "icingadb/icingadb-ti.hpp"
 #include "icinga/customvarobject.hpp"
 #include "remote/messageorigin.hpp"
 #include "base/timer.hpp"
 #include "base/workqueue.hpp"
-#include "redis/redisconnection.hpp"
+#include "icingadb/redisconnection.hpp"
 #include "icinga/checkable.hpp"
 #include "icinga/service.hpp"
 #include "icinga/downtime.hpp"
@@ -40,7 +40,7 @@ struct RedisSubscriptionInfo
 };
 
 /**
- * @ingroup redis
+ * @ingroup icingadb
  */
 class IcingaDB : public ObjectImpl<IcingaDB>
 {
diff --git a/lib/redis/rediswriter.ti b/lib/icingadb/icingadb.ti
similarity index 100%
rename from lib/redis/rediswriter.ti
rename to lib/icingadb/icingadb.ti
diff --git a/lib/redis/redisconnection.cpp b/lib/icingadb/redisconnection.cpp
similarity index 99%
rename from lib/redis/redisconnection.cpp
rename to lib/icingadb/redisconnection.cpp
index 7445a2a8b..c6d94f535 100644
--- a/lib/redis/redisconnection.cpp
+++ b/lib/icingadb/redisconnection.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "redis/redisconnection.hpp"
+#include "icingadb/redisconnection.hpp"
 #include "base/array.hpp"
 #include "base/convert.hpp"
 #include "base/defer.hpp"
diff --git a/lib/redis/redisconnection.hpp b/lib/icingadb/redisconnection.hpp
similarity index 99%
rename from lib/redis/redisconnection.hpp
rename to lib/icingadb/redisconnection.hpp
index 9ef6b5566..9d2684ed1 100644
--- a/lib/redis/redisconnection.hpp
+++ b/lib/icingadb/redisconnection.hpp
@@ -55,7 +55,7 @@ namespace icinga
 /**
  * An Async Redis connection.
  *
- * @ingroup redis
+ * @ingroup icingadb
  */
 	class RedisConnection final : public Object
 	{