diff --git a/config b/config
index 6e8f6cd..b0e8a42 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # What modules, in what order
-MODULES="weather volumebar wifi internet cpuload temperature date time"
+MODULES="weather volumebar wifi internet cpuload cputemp date time"
 
 # Modules that require an active internet connection
 ONLINE_MODULES="weather internet"
diff --git a/modules/temperature b/modules/cputemp
similarity index 91%
rename from modules/temperature
rename to modules/cputemp
index 62ff63a..614e0e1 100755
--- a/modules/temperature
+++ b/modules/cputemp
@@ -3,7 +3,7 @@
 # Gets temperature of the CPU
 # Dependencies: lm_sensors
 
-get_temperature()
+get_cputemp()
 {
 	# CPU_T=$(cat /sys/devices/platform/coretemp.0/hwmon/hwmon?/temp2_input)
 	# CPU_TEMP=$(expr $CPU_T / 1000)
@@ -18,4 +18,4 @@ get_temperature()
 	echo " $CPU_TEMP"
 }
 
-get_temperature
+get_cputemp
diff --git a/modules/fanspeed b/modules/fanspeed
index 16af999..8cc4c52 100755
--- a/modules/fanspeed
+++ b/modules/fanspeed
@@ -7,7 +7,7 @@ PREFIX=' '
 
 get_fan_speed()
 {
-    echo "$PREFIX$(sensors | grep fan1 | cut -d " " -f 9) RPM"
+    echo "$PREFIX$(sensors | grep fan1 | awk 'NR==1{print $2}') RPM"
 }
 
 get_fan_speed