diff --git a/rabbitmq-list_queues b/rabbit-messages
similarity index 97%
rename from rabbitmq-list_queues
rename to rabbit-messages
index 5b5662d..e07b1f3 100755
--- a/rabbitmq-list_queues
+++ b/rabbit-messages
@@ -28,7 +28,7 @@ fi
 # If run with the "config"-parameter, give out information on how the
 # graphs should look. 
 
-VHOST=portal
+VHOST=${vhost:-"/"}
 QUEUE_STATUS=$(sudo rabbitmqctl list_queues -p $VHOST | \
 		grep -v '^Listing' | \
 		grep -v 'done.$')
@@ -51,6 +51,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	for queue in $QUEUES; do
 		echo "$queue.label $queue"
diff --git a/rabbitmq-connections b/rabbitmq-connections
index b4afbcc..72a1039 100755
--- a/rabbitmq-connections
+++ b/rabbitmq-connections
@@ -44,6 +44,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	echo "connections.label Connections"
 	echo "connections.warning $CONN_WARN"
diff --git a/rabbitmq-consumers b/rabbitmq-consumers
index 919a8d7..e0ede7e 100755
--- a/rabbitmq-consumers
+++ b/rabbitmq-consumers
@@ -28,7 +28,7 @@ fi
 # If run with the "config"-parameter, give out information on how the
 # graphs should look. 
 
-VHOST=portal
+VHOST=${vhost:-"/"}
 QUEUE_STATUS=$(sudo rabbitmqctl list_queues -p $VHOST | \
 		grep -v '^Listing' | \
 		grep -v 'done.$')
@@ -51,6 +51,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	for queue in $QUEUES; do
 		echo "$queue.label $queue"
diff --git a/rabbitmq-messages_unacknowledged b/rabbitmq-messages_unacknowledged
index 779612f..4901e4b 100755
--- a/rabbitmq-messages_unacknowledged
+++ b/rabbitmq-messages_unacknowledged
@@ -28,7 +28,7 @@ fi
 # If run with the "config"-parameter, give out information on how the
 # graphs should look. 
 
-VHOST=portal
+VHOST=${vhost:-"/"}
 QUEUE_STATUS=$(sudo rabbitmqctl list_queues -p $VHOST | \
 		grep -v '^Listing' | \
 		grep -v 'done.$')
@@ -51,6 +51,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	for queue in $QUEUES; do
 		echo "$queue.label $queue"
diff --git a/rabbitmq-messages_uncommitted b/rabbitmq-messages_uncommitted
index 4ed075b..2e31417 100755
--- a/rabbitmq-messages_uncommitted
+++ b/rabbitmq-messages_uncommitted
@@ -28,7 +28,7 @@ fi
 # If run with the "config"-parameter, give out information on how the
 # graphs should look. 
 
-VHOST=portal
+VHOST=${vhost:-"/"}
 QUEUE_STATUS=$(sudo rabbitmqctl list_queues -p $VHOST | \
 		grep -v '^Listing' | \
 		grep -v 'done.$')
@@ -51,6 +51,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	for queue in $QUEUES; do
 		echo "$queue.label $queue"
diff --git a/rabbitmq-queue_memory b/rabbitmq-queue_memory
index 524768c..cf00de1 100755
--- a/rabbitmq-queue_memory
+++ b/rabbitmq-queue_memory
@@ -28,7 +28,7 @@ fi
 # If run with the "config"-parameter, give out information on how the
 # graphs should look. 
 
-VHOST=portal
+VHOST=${vhost:-"/"}
 QUEUE_STATUS=$(sudo rabbitmqctl list_queues -p $VHOST | \
 		grep -v '^Listing' | \
 		grep -v 'done.$')
@@ -51,6 +51,7 @@ if [ "$1" = "config" ]; then
 	# We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
 	# 420 milliload)
 	#echo 'graph_scale no'
+	echo 'graph_category RabbitMQ'
 
 	for queue in $QUEUES; do
 		echo "$queue.label $queue"