diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmpd b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmpd
index 1141077..2d6335b 100755
--- a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmpd
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmpd
@@ -43,14 +43,14 @@ IP_BINARY="/sbin/ip"
 SNMPD_BINARY="/usr/sbin/snmpd"
 SNMPD_PID="/run/snmpd.pid"
 #run snmpd process in the following namespace:
-SNMPDNS="haproxy"
+SNMPDNS="zabbix"
 SNMPDRUN="yes"
 SNMPDOPTS="-Lsd -Lf /dev/null -p $SNMPD_PID"
 
 TRAPD_BINARY="/usr/sbin/snmptrapd"
 TRAPD_PID="/run/snmptrapd.pid"
 #run snmptrapd process in the following namespace:
-TRAPDNS="haproxy"
+TRAPDNS="zabbix"
 TRAPDRUN="no"
 TRAPDOPTS="-Lsd -p $TRAPD_PID"
 
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmptrapd b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmptrapd
index 333186a..afb9369 100755
--- a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmptrapd
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmptrapd
@@ -41,7 +41,7 @@
 . /etc/init.d/functions
 
 #run service in the following network namespace:
-NS="haproxy"
+NS="zabbix"
 OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 if [ -e /etc/sysconfig/snmptrapd ]; then
   . /etc/sysconfig/snmptrapd
diff --git a/doc/plugin-guide/source/troubleshooting.rst b/doc/plugin-guide/source/troubleshooting.rst
index 016c48a..98d4c3d 100644
--- a/doc/plugin-guide/source/troubleshooting.rst
+++ b/doc/plugin-guide/source/troubleshooting.rst
@@ -51,7 +51,7 @@ Finding the management VIP to use to send SNMP traps
 
 On the Fuel master node, use the primary controller node (here node-3)::
 
-  # ssh -q node-3 ip netns exec haproxy ifconfig b_zbx_vip_mgmt | \
+  # ssh -q node-3 ip netns exec zabbix ifconfig b_zbx_vip_mgmt | \
       grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//'
   192.168.0.3