diff --git a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
index 159fa1b0b7..eac25d17d6 100644
--- a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
@@ -30,6 +30,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.binlightning"
          download-size="0"
@@ -121,6 +128,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.poessounding"
          download-size="0"
diff --git a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
index b7c54aeea6..02473718cb 100644
--- a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
@@ -184,13 +184,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.stormtrack"
          download-size="0"
@@ -198,13 +191,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.solarimage"
          download-size="0"
diff --git a/deltaScripts/14.2.1/convertNcPirepAirep.sh b/deltaScripts/14.2.1/convertNcPirepAirep.sh
new file mode 100644
index 0000000000..3ac33a6e65
--- /dev/null
+++ b/deltaScripts/14.2.1/convertNcPirepAirep.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# DR #2316,2317 replace airep and pirep with ncairep and ncpirep
+
+PSQL="/awips2/psql/bin/psql"
+
+SQL_COMMAND="
+delete from plugin_info where name in ('ncpirep','ncairep');
+drop table pirep, pirep_anc_data, ncpirep_anc_data, airep;
+alter table ncpirep rename to pirep;
+alter table ncairep rename to airep;
+update pirep set datauri = replace(datauri, 'ncpirep', 'pirep');
+update airep set datauri = replace(datauri, 'ncairep', 'airep');
+"
+${PSQL} -U awips -d metadata -c "${SQL_COMMAND}"
+
+if [ -d "/awips2/edex/data/hdf5/ncpirep" ]
+then
+    mv /awips2/edex/data/hdf5/ncpirep /awips2/edex/data/hdf5/pirep 
+    
+    files=`ls /awips2/edex/data/hdf5/pirep/ncpirep*.h5`
+    for file in $files; do
+        newfile=${file/ncpirep/pirep}
+        mv $file $newfile
+    done
+fi
+
+if [ -d "/awips2/edex/data/hdf5/ncairep" ]
+then
+    mv /awips2/edex/data/hdf5/ncairep /awips2/edex/data/hdf5/airep
+    
+    files=`ls /awips2/edex/data/hdf5/airep/ncairep*.h5`
+    for file in $files; do
+        newfile=${file/ncairep/airep}
+        mv $file $newfile
+    done
+fi
\ No newline at end of file
diff --git a/deltaScripts/14.2.1/dropPirepAirep.sh b/deltaScripts/14.2.1/dropPirepAirep.sh
deleted file mode 100644
index 7d6569474c..0000000000
--- a/deltaScripts/14.2.1/dropPirepAirep.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# DR #2316,2317 drop pirep,ncpirep,airep,ncairep
-
-PSQL="/awips2/psql/bin/psql"
-
-${PSQL} -U awips -d metadata -c "delete from plugin_info where name in ('pirep','ncpirep','airep','ncairep');"
-${PSQL} -U awips -d metadata -c "drop table pirep, pirep_anc_data, ncpirep, ncpirep_anc_data, airep, ncairep;"
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index ef4b8d03c5..2f2e470f33 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -122,6 +122,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.noaa.nws.ncep.edex.plugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.edex.plugin.ccfp"
          download-size="0"
@@ -178,6 +185,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.noaa.nws.ncep.edex.plugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.edex.plugin.poessounding"
          download-size="0"
@@ -304,6 +318,20 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.obs"
          download-size="0"
diff --git a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
index 411c644613..34ae327187 100644
--- a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
+++ b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
@@ -255,13 +255,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.ncgrib"
          download-size="0"
@@ -276,13 +269,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.ncscd"
          download-size="0"
@@ -346,13 +332,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.edex.plugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.edex.plugin.ncpafm"
          download-size="0"
@@ -360,13 +339,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.edex.plugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.edex.plugin.ncscd"
          download-size="0"