diff --git a/environmental_measurement.proto b/environmental_measurement.proto
index ba972f4..0a14325 100644
--- a/environmental_measurement.proto
+++ b/environmental_measurement.proto
@@ -4,7 +4,7 @@ option go_package = "github.com/meshtastic/gomeshproto";
 /*
  * TODO: REPLACE
  */
-message EnvironmentalMeasurement {
+message Telemetry {
 
   /*
    * TODO: REPLACE
diff --git a/portnums.proto b/portnums.proto
index 11f7b2a..1df9a89 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -120,10 +120,10 @@ enum PortNum {
   RANGE_TEST_APP = 66;
 
   /*
-   * Provides a format to send and receive environmental data from the Meshtastic network.
+   * Provides a format to send and receive telemetry data from the Meshtastic network.
    * Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
    */
-  ENVIRONMENTAL_MEASUREMENT_APP = 67;
+  TELEMETRY_APP = 67;
 
   /*
    * Experimental tools for estimating node position without a GPS
diff --git a/radioconfig.proto b/radioconfig.proto
index b42eaf4..f2ef688 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -752,47 +752,47 @@ message RadioConfig {
     reserved 136;
 
     /*
-     * Preferences for the EnvironmentalMeasurement Plugin
+     * Preferences for the Teletry Plugin
      * FIXME - Move this out of UserPreferences and into a section for plugin configuration.
-     * Enable/Disable the environmental measurement plugin measurement collection
+     * Enable/Disable the telemetry measurement plugin measurement collection
      */
-    bool environmental_measurement_plugin_measurement_enabled = 140;
+    bool telemetry_module_measurement_enabled = 140;
 
     /*
-     * Enable/Disable the environmental measurement plugin on-device display
+     * Enable/Disable the telemetry measurement plugin on-device display
      */
-    bool environmental_measurement_plugin_screen_enabled = 141;
+    bool telemetry_module_screen_enabled = 141;
 
     /*
      * Sometimes sensor reads can fail.
      * If this happens, we will retry a configurable number of attempts,
      * each attempt will be delayed by the minimum required refresh rate for that sensor
      */
-    uint32 environmental_measurement_plugin_read_error_count_threshold = 142;
+    uint32 telemetry_module_read_error_count_threshold = 142;
 
     /*
      * Interval in seconds of how often we should try to send our
      * measurements to the mesh
      */
-    uint32 environmental_measurement_plugin_update_interval = 143;
+    uint32 telemetry_module_update_interval = 143;
 
     /*
      * Sometimes we can end up with more than read_error_count_threshold failures.
      * In this case, we will stop trying to read from the sensor for a while.
      * Wait this long until trying to read from the sensor again
      */
-    uint32 environmental_measurement_plugin_recovery_interval = 144;
+    uint32 telemetry_module_recovery_interval = 144;
 
     /*
      * We'll always read the sensor in Celsius, but sometimes we might want to
      * display the results in Farenheit as a "user preference".
      */
-    bool environmental_measurement_plugin_display_farenheit = 145;
+    bool telemetry_module_display_farenheit = 145;
 
     /*
      * TODO: REPLACE
      */
-    enum EnvironmentalMeasurementSensorType {
+    enum TelemetrySensorType {
 
       /*
        * TODO: REPLACE
@@ -843,12 +843,12 @@ message RadioConfig {
     /*
      * Specify the sensor type
      */
-    EnvironmentalMeasurementSensorType environmental_measurement_plugin_sensor_type = 146;
+    TelemetrySensorType telemetry_module_sensor_type = 146;
 
     /*
      * Specify the peferred GPIO Pin for sensor readings
      */
-    uint32 environmental_measurement_plugin_sensor_pin = 147;
+    uint32 telemetry_module_sensor_pin = 147;
 
     /*
      * Bit field of boolean configuration options for POSITION messages