diff --git a/plugins/rpi/cpu_freq_1sec b/plugins/raspberry-pi/cpu_freq_1sec
similarity index 100%
rename from plugins/rpi/cpu_freq_1sec
rename to plugins/raspberry-pi/cpu_freq_1sec
diff --git a/plugins/raspberrypi/raspi_temp b/plugins/raspberry-pi/raspi_temp
similarity index 95%
rename from plugins/raspberrypi/raspi_temp
rename to plugins/raspberry-pi/raspi_temp
index 41a4c0e0..eb4b5028 100755
--- a/plugins/raspberrypi/raspi_temp
+++ b/plugins/raspberry-pi/raspi_temp
@@ -48,4 +48,4 @@ EOM
         exit 0;;
 esac
 
-echo "temp.value `/opt/vc/bin/vcgencmd measure_temp | sed -n "s/temp=\(.*\)'C/\1/p"`"
+echo "temp.value `vcgencmd measure_temp | sed -n "s/temp=\(.*\)'C/\1/p"`"
diff --git a/plugins/rpi/rpi_temp b/plugins/raspberry-pi/rpi_temp
similarity index 100%
rename from plugins/rpi/rpi_temp
rename to plugins/raspberry-pi/rpi_temp