@@ -25,12 +25,11 @@ module Rubysermon

 			@cpu_load >= @options[:notify_threshold].to_i

 		end

-		def y_axis_name

-			@y_axis

-		end

-

-		def graph_name

-			"#@graph_name (CPUs: #@cpu_count)"

+		def graph_labels

+			{

+				y_axis: @y_axis,

+				graph_name: "#@graph_name (CPUs: #@cpu_count)"

+			}

 		end

 	end

 end

\ No newline at end of file

@@ -17,11 +17,7 @@ module Rubysermon

 			throw Rubysermon::ModTemplateException

 		end

-		def y_axis_name

-			throw Rubysermon::ModTemplateException

-		end

-

-		def graph_name

+		def graph_labels

 			throw Rubysermon::ModTemplateException

 		end

@@ -7,12 +7,11 @@ class Cpu_test < MiniTest::Unit::TestCase

 		@cpu = Rubysermon::Cpu.new

 	end

-	def test_y_axis

-		assert_equal("CPU Load", @cpu.y_axis_name)

-	end

+	def test_labels

+		labels = @cpu.graph_labels

-	def test_graph_name

-		assert_match(/^CPU Load In Time \(CPUs: [\d]+\)$/, @cpu.graph_name)

+		assert_equal("CPU Load", labels[:y_axis])

+		assert_match(/^CPU Load In Time \(CPUs: [\d]+\)$/, labels[:graph_name])

 	end

 	def test_cpu_load