diff --git a/devstack/libs/collectd b/devstack/libs/collectd
index 7df72cc..aba2675 100644
--- a/devstack/libs/collectd
+++ b/devstack/libs/collectd
@@ -36,7 +36,7 @@ cat << EOF | sudo tee $COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf
 </LoadPlugin>
 
 <Plugin python>
-    ModulePath "$COLLECTD_DIR"
+    ModulePath "$COLLECTD_CEILOMETER_DIR"
     LogTraces true
     Interactive false
     Import "collectd_ceilometer.plugin"
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aafdfbc..f023073 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -2,7 +2,7 @@ local xtrace=$(set +o | grep xtrace)
 set -o xtrace
 
     # Initial source of lib script
-    source $COLLECTD_DIR/devstack/libs/collectd
+    source $COLLECTD_CEILOMETER_DIR/devstack/libs/collectd
 
     case $1 in
         "stack")
diff --git a/devstack/settings b/devstack/settings
index 4b46360..9d37ab3 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,5 +1,5 @@
 # General settings
-COLLECTD_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
+COLLECTD_CEILOMETER_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
 COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-3}
 COLLECTD_INSTALL=${COLLECTD_INSTALL:-True}
 COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''}