diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_ahi.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_ahi.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_avhrr.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_avhrr.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_goes.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_goes.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_leogeo.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_leogeo.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_modis.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_modis.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_seviri.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_seviri.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_viirs.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.json
similarity index 100%
rename from parm/ioda/bufr2ioda/bufr2ioda_satwind_amv_viirs.json
rename to parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.json
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_ahi.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_ahi.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.py
index 3f897e61d..e4260184c 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_ahi.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.py
@@ -391,8 +391,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Wind Computation Method
@@ -400,16 +400,6 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Satellite-derived Wind Computation Method') \
                 .write_data(swcm2)
 
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
             # Pressure
             obsspace.create_var('MetaData/pressure', dtype=pressure2.dtype, fillval=pressure2.fill_value) \
                 .write_attr('units', 'pa') \
@@ -428,6 +418,16 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Station Elevation') \
                 .write_data(stnelev2)
 
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
             # U-Wind Component
             obsspace.create_var('ObsValue/windEastward', dtype=uob2.dtype, fillval=wspd2.fill_value) \
                 .write_attr('units', 'm s-1') \
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_avhrr.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_avhrr.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.py
index 6ad0bee4d..9ad22a55b 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_avhrr.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.py
@@ -386,8 +386,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Wind Computation Method
@@ -395,16 +395,6 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Satellite-derived Wind Computation Method') \
                 .write_data(swcm2)
 
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
             # Pressure
             obsspace.create_var('MetaData/pressure', dtype=pressure2.dtype, fillval=pressure2.fill_value) \
                 .write_attr('units', 'pa') \
@@ -423,6 +413,16 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Station Elevation') \
                 .write_data(stnelev2)
 
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
             # U-Wind Component
             obsspace.create_var('ObsValue/windEastward', dtype=uob2.dtype, fillval=uob2.fill_value) \
                 .write_attr('units', 'm s-1') \
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_goes.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_goes.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.py
index 594e5f008..7ab41d63b 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_goes.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.py
@@ -383,8 +383,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Quality: Percent Confidence - Expected Error
@@ -408,16 +408,6 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Wind Height Assignment Method') \
                 .write_data(eham2)
 
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
             # Pressure
             obsspace.create_var('MetaData/pressure', dtype=pressure2.dtype, fillval=pressure2.fill_value) \
                 .write_attr('units', 'pa') \
@@ -436,6 +426,16 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Station Elevation') \
                 .write_data(stnelev2)
 
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
             # U-Wind Component
             obsspace.create_var('ObsValue/windEastward', dtype=uob2.dtype, fillval=wspd2.fill_value) \
                 .write_attr('units', 'm s-1') \
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_leogeo.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.py
similarity index 99%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_leogeo.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.py
index 1fc69e2a5..d879293b6 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_leogeo.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.py
@@ -360,7 +360,7 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
                 .write_attr('long_name', 'Quality Information Without Forecast') \
                 .write_data(qifn2)
 
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_modis.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_modis.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.py
index b67086b76..ff9706b8b 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_modis.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.py
@@ -389,8 +389,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Wind Computation Method
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_seviri.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_seviri.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.py
index dc873d962..9f2db7fdd 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_seviri.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.py
@@ -364,8 +364,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Wind Computation Method
@@ -373,16 +373,6 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Satellite-derived Wind Computation Method') \
                 .write_data(swcm2)
 
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
-            # ObsType based on computation method/spectral band
-            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
-                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
-                .write_data(obstype2)
-
             # Pressure
             obsspace.create_var('MetaData/pressure', dtype=pressure2.dtype, fillval=pressure2.fill_value) \
                 .write_attr('units', 'pa') \
@@ -401,6 +391,16 @@ def bufr_to_ioda(config, logger):
                 .write_attr('long_name', 'Station Elevation') \
                 .write_data(stnelev2)
 
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windEastward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
+            # ObsType based on computation method/spectral band
+            obsspace.create_var('ObsType/windNorthward', dtype=obstype2.dtype, fillval=swcm2.fill_value) \
+                .write_attr('long_name', 'Observation Type based on Satellite-derived Wind Computation Method and Spectral Band') \
+                .write_data(obstype2)
+
             # U-Wind Component
             obsspace.create_var('ObsValue/windEastward', dtype=uob2.dtype, fillval=wspd2.fill_value) \
                 .write_attr('units', 'm s-1') \
diff --git a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_viirs.py b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.py
similarity index 98%
rename from ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_viirs.py
rename to ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.py
index 18f87db04..4941ff977 100755
--- a/ush/ioda/bufr2ioda/bufr2ioda_satwind_amv_viirs.py
+++ b/ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.py
@@ -385,8 +385,8 @@ def bufr_to_ioda(config, logger):
                 .write_data(ogce2)
 
             # Quality: Percent Confidence - Quality Information Without Forecast
-            obsspace.create_var('MetaData/qualityInformationWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
-                .write_attr('long_name', 'Quality Information Without Forecast') \
+            obsspace.create_var('MetaData/qiWithoutForecast', dtype=qifn2.dtype, fillval=qifn2.fill_value) \
+                .write_attr('long_name', 'QI Without Forecast') \
                 .write_data(qifn2)
 
             # Wind Computation Method