diff --git a/.gitignore b/.gitignore
index bf5533a68e..f3b4c0450e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ bin-test/
 *.pyc
 *.o
 *.orig
-
+*.log
diff --git a/RadarServer/com.raytheon.rcm.tools/src/otrtool.py b/RadarServer/com.raytheon.rcm.tools/src/otrtool.py
index 245e1494a7..c50158f1f8 100755
--- a/RadarServer/com.raytheon.rcm.tools/src/otrtool.py
+++ b/RadarServer/com.raytheon.rcm.tools/src/otrtool.py
@@ -27,7 +27,7 @@ import time
 from xml.dom.minidom import parseString
 
 #import stomp
-from ufpy import stomp
+from awips import stomp
 
 def encodeElevation(elev):
     if elev >= 0:
diff --git a/RadarServer/com.raytheon.rcm.tools/src/rpstool.py b/RadarServer/com.raytheon.rcm.tools/src/rpstool.py
index a09e574b45..86048c4787 100755
--- a/RadarServer/com.raytheon.rcm.tools/src/rpstool.py
+++ b/RadarServer/com.raytheon.rcm.tools/src/rpstool.py
@@ -28,7 +28,7 @@ import time
 from xml.dom.minidom import parseString
 
 #import stomp
-from ufpy import stomp
+from awips import stomp
 
 exit_cond = None
 
diff --git a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/ClimateProcessLogger.py b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/ClimateProcessLogger.py
index db274941d9..d849032f2c 100644
--- a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/ClimateProcessLogger.py
+++ b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/ClimateProcessLogger.py
@@ -33,7 +33,7 @@
 #
 
 import logging
-from ufpy import AlertVizHandler
+from awips import AlertVizHandler
 
 PLUGIN_NAME = 'com.raytheon.viz.aviation'
 CLIMATE_CATEGORY = "CLIMATE"
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py
index ba29217ba2..a2d7a3bb19 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py
@@ -30,7 +30,7 @@
 
 import time, string
 import logging
-from ufpy import TimeUtil
+from awips import TimeUtil
 
 offset = 0
 timeStr = ""
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/configureTextProducts.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/configureTextProducts.py
index 7715fe40d1..2ef36c283e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/configureTextProducts.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/configureTextProducts.py
@@ -41,7 +41,7 @@ from os.path import dirname
 from os.path import abspath
 from os.path import join
 
-from ufpy import ThriftClient
+from awips import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ConfigureTextProductsRequest
 
 SCRIPT_DIR = abspath(dirname(argv[0]))
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py b/edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
index 6770f789ae..da03997290 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
@@ -56,7 +56,7 @@
 import sys, os, time, re, string, getopt
 import copy
 import LogStream
-from ufpy import TimeUtil
+from awips import TimeUtil
 from com.raytheon.uf.edex.decodertools.time import TimeTools
 from com.raytheon.uf.common.wmo import WMOTimeParser
 
diff --git a/edexOsgi/com.raytheon.uf.common.localization.python/utility/common_static/base/python/PythonOverriderPure.py b/edexOsgi/com.raytheon.uf.common.localization.python/utility/common_static/base/python/PythonOverriderPure.py
index 7d80ed3c82..80188ffa4d 100644
--- a/edexOsgi/com.raytheon.uf.common.localization.python/utility/common_static/base/python/PythonOverriderPure.py
+++ b/edexOsgi/com.raytheon.uf.common.localization.python/utility/common_static/base/python/PythonOverriderPure.py
@@ -38,7 +38,7 @@
 import os, tempfile, shutil
 import numpy
 import PythonOverriderCore
-from ufpy import ThriftClient
+from awips import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.auth.resp import SuccessfulExecution
 from dynamicserialize.dstypes.com.raytheon.uf.common.localization import LocalizationContext
 from dynamicserialize.dstypes.com.raytheon.uf.common.localization.msgs import ListUtilityCommand
diff --git a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JData.py b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JData.py
index 52ca0ddbf3..6f5c146756 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JData.py
+++ b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JData.py
@@ -32,7 +32,7 @@
 # 
 #
 
-from ufpy.dataaccess import IData
+from awips.dataaccess import IData
 import JUtil, DataTime
 
 class JData(IData, JUtil.JavaWrapperClass):
diff --git a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JDataRequest.py b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JDataRequest.py
index 3153de901f..70e819f2d6 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JDataRequest.py
+++ b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JDataRequest.py
@@ -36,7 +36,7 @@
 # 
 #
 
-from ufpy.dataaccess import IDataRequest
+from awips.dataaccess import IDataRequest
 from com.raytheon.uf.common.dataplugin.level import Level
 import JUtil
 import jep
diff --git a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGeometryData.py b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGeometryData.py
index 0e0c4efb9d..2dc47a1f94 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGeometryData.py
+++ b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGeometryData.py
@@ -34,7 +34,7 @@
 #
 #
 
-from ufpy.dataaccess import IGeometryData
+from awips.dataaccess import IGeometryData
 import JData
 
 class JGeometryData(IGeometryData, JData.JData):
diff --git a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGridData.py b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGridData.py
index 6c9321f133..a4da3eaefe 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGridData.py
+++ b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JGridData.py
@@ -35,7 +35,7 @@
 # 
 #
 
-from ufpy.dataaccess import IGridData
+from awips.dataaccess import IGridData
 import JData
 
 class JGridData(IGridData, JData.JData):
diff --git a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JepRouter.py b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JepRouter.py
index beeedcc658..b66dc46f05 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JepRouter.py
+++ b/edexOsgi/com.raytheon.uf.edex.dataaccess/utility/common_static/base/python/dataaccess/JepRouter.py
@@ -40,7 +40,7 @@
 # 
 #
 
-from ufpy.dataaccess import IDataRequest
+from awips.dataaccess import IDataRequest
 
 from com.raytheon.uf.common.dataaccess import DataAccessLayer as JavaDataAccessLayer
 from com.raytheon.uf.common.dataaccess.impl import DefaultDataRequest
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/importAdaptivePlot.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/importAdaptivePlot.py
index 8bcdef47c0..40a5db0a7c 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/importAdaptivePlot.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/importAdaptivePlot.py
@@ -112,7 +112,7 @@ if exportFileName is None:
     if idx > -1:
         exportFileName = exportFileName[0:idx]
 
-from ufpy.ThriftClient import * 
+from awips.ThriftClient import * 
 client = ThriftClient(server)
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.pointdata.requests import *
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/convertcdl2xml/convertCDL2XML.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/convertcdl2xml/convertCDL2XML.py
index 3fe34fd6e0..1cd2354f50 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/convertcdl2xml/convertCDL2XML.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/convertcdl2xml/convertCDL2XML.py
@@ -42,7 +42,7 @@ import sys
 import xml.dom.minidom as minidom
 import xml.etree.ElementTree as ET
 
-from ufpy import UsageArgumentParser
+from awips import UsageArgumentParser
 
 try:
     # dev environment
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
index b1405ef5f8..bca9f0404c 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
@@ -8,7 +8,7 @@
 ##
 import os
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 
 class GpdCliRequestHandler:
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
index 243e7ca477..36fa95543e 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
@@ -8,7 +8,7 @@ import logging
 import sys
 import time
 import GpdCliRequestHandler
-from ufpy import UsageArgumentParser
+from awips import UsageArgumentParser
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg
 from dynamicserialize.dstypes.java.util import Date
 
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py
index 76d103522f..724743d6cf 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/fxaAnnounce.py
@@ -40,7 +40,7 @@ import os
 #    11/11/2011      11484         rferrel        Added SYSTEM for WSHNIMNAT
 #
 
-from ufpy import NotificationMessage 
+from awips import NotificationMessage 
 
 def usage():
   print ''
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/sendNotificationMsg.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/sendNotificationMsg.py
index 052dfb0e32..fdb0593417 100755
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/sendNotificationMsg.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/msg/sendNotificationMsg.py
@@ -38,7 +38,7 @@ import os, socket
 #
 #
 
-from ufpy import NotificationMessage
+from awips import NotificationMessage
 
 class PrintHelpOnErrorParser(ArgumentParser):
    def error(self, message):
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
index 68d79bc602..64fa3c16d8 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
@@ -1,5 +1,5 @@
 import os
-from ufpy import ThriftClient
+from awips import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import StringDataRecord
 from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import ByteDataRecord
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen.request import RetrieveAllProductsRequest
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
index 2db5c0a355..b11230aa34 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
@@ -1,5 +1,5 @@
 import os
-from ufpy import ThriftClient
+from awips import ThriftClient
 #from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import ByteDataRecord
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen.request import StoreActivityRequest
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen import ResponseMessageValidate
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/retrieveActivity.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/retrieveActivity.py
index 65b3c87e93..12b44c9eca 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/retrieveActivity.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/retrieveActivity.py
@@ -25,7 +25,7 @@ import logging
 import xml.etree.ElementTree as ET
 from Tkinter import *
 
-from ufpy import UsageArgumentParser
+from awips import UsageArgumentParser
 import lib.CommHandler as CH
 import ProductRetriever
 import ActivityUtil
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
index 3f37efcd89..d964057535 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
@@ -9,7 +9,7 @@ import io
 import logging
 import xml.etree.ElementTree as ET
 
-from ufpy import UsageArgumentParser
+from awips import UsageArgumentParser
 from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen import ActivityInfo
 import ProductStorer
 
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
index 2dd8fdc1be..606200d4cf 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
@@ -37,8 +37,8 @@
 import logging
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.grid.request import DeleteAllGridDataRequest
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 logger = None
 def __initLogger():
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/qpidNotify/qpidNotify.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/qpidNotify/qpidNotify.py
index 3c10526873..0d071186cb 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/qpidNotify/qpidNotify.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/qpidNotify/qpidNotify.py
@@ -37,7 +37,7 @@
 #                                                 for grib messages
 ##############################################################################
 
-from ufpy import qpidingest
+from awips import qpidingest
 from lib.Util import doWithinTime
 
 import logging
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
index 78896be429..b8cb0955fa 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
@@ -29,7 +29,7 @@ import lib.Util as util
 import conf.SMConfig as config
 import collections
 
-from ufpy import ThriftClient
+from awips import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.request import SubscriptionRequest
 ##############################################################################
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
index bed1706dc8..2500776011 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
@@ -29,7 +29,7 @@ import subscription.SubscriptionManager as SM
 import conf.TDBConfig as config
 import collections
 
-from ufpy import ThriftClient
+from awips import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.dbsrv import TextDBRequest
 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/log_msg_python b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/log_msg_python
index f9f741deb0..a634beb996 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/log_msg_python
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/log_msg_python
@@ -26,7 +26,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request impo
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 from dynamicserialize import DynamicSerializationManager
 
-from ufpy import ThriftClient, ConfigFileUtil
+from awips import ThriftClient, ConfigFileUtil
 
 #
 # TODO: ADD DESCRIPTION
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_configuration.py b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_configuration.py
index 8b3242555b..38f43fd582 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_configuration.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_configuration.py
@@ -25,7 +25,7 @@ import os
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ProcessReceivedConfRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 
-from ufpy import ThriftClient, ConfigFileUtil
+from awips import ThriftClient, ConfigFileUtil
 
 #
 # TODO: ADD DESCRIPTION
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_grids.py b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_grids.py
index 2ed00d9c01..2a8a1bfbf8 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_grids.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/receive_grids.py
@@ -25,7 +25,7 @@ import os
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ProcessReceivedDigitalDataRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 
-from ufpy import ThriftClient, ConfigFileUtil
+from awips import ThriftClient, ConfigFileUtil
 
 #
 # TODO: ADD DESCRIPTION
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/bin/src/iscdatarec/iscDataRec.py b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/bin/src/iscdatarec/iscDataRec.py
index 502d153093..90e14bce71 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/bin/src/iscdatarec/iscDataRec.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/bin/src/iscdatarec/iscDataRec.py
@@ -23,7 +23,7 @@ import os
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import IscDataRecRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 #
 # TODO: ADD DESCRIPTION
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/getNotify.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/getNotify.py
index 747934d8a3..d2eb257187 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/getNotify.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/getNotify.py
@@ -86,7 +86,7 @@ class GetGfeNotifyTopicListener(threading.Thread):
         threading.Thread.__init__(self)
             
     def run(self):        
-        from ufpy import QpidSubscriber
+        from awips import QpidSubscriber
         self.qs = QpidSubscriber.QpidSubscriber(self.hostname, self.portNumber)        
         self.qs.topicSubscribe(self.topicName, self.receivedMessage) 
     
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/VTECDecoder/VTECDecoder.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/VTECDecoder/VTECDecoder.py
index bf9de127c1..ebee0d5d66 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/VTECDecoder/VTECDecoder.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/VTECDecoder/VTECDecoder.py
@@ -8,8 +8,8 @@ import logging
 import traceback
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import SendPracticeProductRequest
-from ufpy import ThriftClient
-from ufpy import TimeUtil
+from awips import ThriftClient
+from awips import TimeUtil
 
 class VTECDecoder(object):
     """
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/MergeVTEC.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/MergeVTEC.py
index 6497dc540e..157f8f9505 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/MergeVTEC.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/MergeVTEC.py
@@ -44,9 +44,9 @@ import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import MergeActiveTableRequest
 
-from ufpy import ThriftClient
-from ufpy import TimeUtil
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import TimeUtil
+from awips import UsageArgumentParser
 
 
 logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s:  %(message)s", 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/dumpAT.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/dumpAT.py
index 6a6c218c81..c3a5d01e25 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/dumpAT.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/dumpAT.py
@@ -22,7 +22,7 @@
 import getopt, sys
 import logging, time, traceback, string, gzip
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import DumpActiveTableRequest
-from ufpy import ThriftClient
+from awips import ThriftClient
 from getVtecAttribute import getVtecAttribute
 
 ## sorting function
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getAT.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getAT.py
index 8fb93c64b1..0df0bd1e6d 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getAT.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getAT.py
@@ -20,7 +20,7 @@
 import os
 import logging
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetActiveTableDictRequest
-from ufpy import ThriftClient
+from awips import ThriftClient
 from getVtecAttribute import getVtecAttribute
 
 logging.basicConfig(level=logging.INFO)
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getFourCharSites.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getFourCharSites.py
index c853bb0aa4..7c0b31c2b8 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getFourCharSites.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getFourCharSites.py
@@ -20,7 +20,7 @@
 
 import logging
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetFourCharSitesRequest
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 ##
 # Convert a list with 3-char site IDs to a list of 4-char site IDs.
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getVtecAttribute.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getVtecAttribute.py
index 2ad9e48f84..ea18a631a8 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getVtecAttribute.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/getVtecAttribute.py
@@ -21,7 +21,7 @@
 import os
 import logging
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetVtecAttributeRequest
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 ##
 # Ask the server for an attribute from the VTECPartners script for a site.
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/ingestAT.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/ingestAT.py
index 8abd3b4d21..4648846305 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/ingestAT.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/ingestAT.py
@@ -40,8 +40,8 @@ import os
 import sys
 
 import MergeVTEC
-from ufpy import TimeUtil
-from ufpy import UsageArgumentParser
+from awips import TimeUtil
+from awips import UsageArgumentParser
 
 
 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/requestAT.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/requestAT.py
index 31442a69c4..087ad7d3e1 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/requestAT.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/requestAT.py
@@ -36,8 +36,8 @@ import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import RetrieveRemoteActiveTableRequest
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s:  %(message)s", 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/sendAT.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/sendAT.py
index 64dd3aa565..2b5c350f12 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/sendAT.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/activeTable/sendAT.py
@@ -41,8 +41,8 @@ import logging
 import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import SendActiveTableRequest
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s:  %(message)s", 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpBreakAllLocks/ifpBreakAllLocks.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpBreakAllLocks/ifpBreakAllLocks.py
index eba808c132..1da9e3b73f 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpBreakAllLocks/ifpBreakAllLocks.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpBreakAllLocks/ifpBreakAllLocks.py
@@ -32,8 +32,8 @@ import sys
 import os
 import logging
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 #
 # Provides a command-line utility to break all locks.
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpag/ifpAG.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpag/ifpAG.py
index 5c0793fa63..732490bd61 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpag/ifpAG.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpag/ifpAG.py
@@ -41,8 +41,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import
 from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import LocalizationStreamPutRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 ##
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpinit/ifpInit.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpinit/ifpInit.py
index 0493aa9b25..6bd251f036 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpinit/ifpInit.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpinit/ifpInit.py
@@ -24,8 +24,8 @@ import os
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import SmartInitRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 ##
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
index ce4b8818dd..50ae0f2c5d 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
@@ -41,10 +41,10 @@ import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIfpNetCDFGridRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
-from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
-from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
+from awips import ThriftClient
+from awips import UsageArgumentParser
+from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
+from awips.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
 
 
 RETRY_ATTEMPTS = 3
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
index 66754d5eb1..43bc28b59b 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
@@ -39,7 +39,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import User
 from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import UserId
 from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import GetActiveSitesRequest
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 #
 # The ifpServerText program.  Stores, deletes, gets, and inventories text.
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
index 0f2a4782e4..cd79dddb7d 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
@@ -22,10 +22,10 @@ import logging
 import os
 import sys
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
-from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
-from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
+from awips import ThriftClient
+from awips import UsageArgumentParser
+from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
+from awips.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIscMosaicRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/movegfedata/moveGFEData.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/movegfedata/moveGFEData.py
index 2bf8c73954..30b61ba3c9 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/movegfedata/moveGFEData.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/movegfedata/moveGFEData.py
@@ -36,8 +36,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import
 from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import LocalizationStreamPutRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 #
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/publishgfe/publishGFE.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/publishgfe/publishGFE.py
index f59911c365..b9b13d8378 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/publishgfe/publishGFE.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/publishgfe/publishGFE.py
@@ -24,8 +24,8 @@ import argparse
 import logging
 import sys
 
-from ufpy import UsageArgumentParser
-from ufpy.gfe import IFPClient
+from awips import UsageArgumentParser
+from awips.gfe import IFPClient
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
index 8697c6fbae..38959ee21b 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
@@ -40,9 +40,9 @@ import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import PurgeGfeGridsRequest
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
-from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
+from awips import ThriftClient
+from awips import UsageArgumentParser
+from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
 
 
 logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s:  %(message)s", 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgfemessage/sendGfeMessage.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgfemessage/sendGfeMessage.py
index 149c6cbcde..33cb5dd267 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgfemessage/sendGfeMessage.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgfemessage/sendGfeMessage.py
@@ -19,7 +19,7 @@
 ##
 
 from optparse import OptionParser
-from ufpy import NotificationMessage
+from awips import NotificationMessage
 from argparse import ArgumentParser
 import os, sys
 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgridstondfd/SendGridsToNDFD.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgridstondfd/SendGridsToNDFD.py
index 88ad46022b..e59bde785e 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgridstondfd/SendGridsToNDFD.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/sendgridstondfd/SendGridsToNDFD.py
@@ -40,8 +40,8 @@ import sys
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExportGridsRequest
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 
 class SendGridsToNDFD:    
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/ActivationTopicListener.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/ActivationTopicListener.py
index 3ced4f8acc..e557c04c8a 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/ActivationTopicListener.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/ActivationTopicListener.py
@@ -36,7 +36,7 @@ import traceback
 import dynamicserialize
 from dynamicserialize.dstypes.com.raytheon.uf.common.site.notify import ClusterActivationNotification
 
-from ufpy import QpidSubscriber
+from awips import QpidSubscriber
 
 class ActivationTopicListener(threading.Thread):
     def __init__(self, hostname='localHost', portNumber='5762', topicName="edex.alerts.siteActivate" ):
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/activateSite.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/activateSite.py
index 624901713d..dde88fe913 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/activateSite.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/activateSite.py
@@ -35,8 +35,8 @@ import sys
 import time
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import ActivateSiteRequest
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 from ActivationTopicListener import ActivationTopicListener
 
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/deactivateSite.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/deactivateSite.py
index 7fc0498b5f..669d766673 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/deactivateSite.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/siteActivation/deactivateSite.py
@@ -35,8 +35,8 @@ import time
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import DeactivateSiteRequest
 
-from ufpy import ThriftClient
-from ufpy import UsageArgumentParser
+from awips import ThriftClient
+from awips import UsageArgumentParser
 
 from ActivationTopicListener import ActivationTopicListener
 
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py
index 32abbcf7b8..e1d07b6476 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py
@@ -30,7 +30,7 @@
 #
 
 
-from ufpy.dataaccess import IDataRequest
+from awips.dataaccess import IDataRequest
 
 from dynamicserialize.dstypes.com.vividsolutions.jts.geom import Envelope
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level
diff --git a/pythonPackages/msaslaps/acars/a2acarsStub.py b/pythonPackages/msaslaps/acars/a2acarsStub.py
index 2976b81e8d..66504ea3a2 100644
--- a/pythonPackages/msaslaps/acars/a2acarsStub.py
+++ b/pythonPackages/msaslaps/acars/a2acarsStub.py
@@ -43,7 +43,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():    
diff --git a/pythonPackages/msaslaps/aireppirep/a2airepStub.py b/pythonPackages/msaslaps/aireppirep/a2airepStub.py
index ad219be76a..44f9168dae 100644
--- a/pythonPackages/msaslaps/aireppirep/a2airepStub.py
+++ b/pythonPackages/msaslaps/aireppirep/a2airepStub.py
@@ -41,7 +41,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 
diff --git a/pythonPackages/msaslaps/aireppirep/a2pirepStub.py b/pythonPackages/msaslaps/aireppirep/a2pirepStub.py
index 77f3f6e23f..6b87ae8326 100644
--- a/pythonPackages/msaslaps/aireppirep/a2pirepStub.py
+++ b/pythonPackages/msaslaps/aireppirep/a2pirepStub.py
@@ -42,7 +42,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 
diff --git a/pythonPackages/msaslaps/grid/a2invmdlStub.py b/pythonPackages/msaslaps/grid/a2invmdlStub.py
index b56d67992b..f7b1cf04bd 100644
--- a/pythonPackages/msaslaps/grid/a2invmdlStub.py
+++ b/pythonPackages/msaslaps/grid/a2invmdlStub.py
@@ -33,7 +33,7 @@ import argparse
 import numpy
 import sys
 
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 
 def get_args():
     parser = argparse.ArgumentParser(conflict_handler="resolve")
diff --git a/pythonPackages/msaslaps/grid/a2rdmdlCommon.py b/pythonPackages/msaslaps/grid/a2rdmdlCommon.py
index 2566db9b5b..029c2fe816 100644
--- a/pythonPackages/msaslaps/grid/a2rdmdlCommon.py
+++ b/pythonPackages/msaslaps/grid/a2rdmdlCommon.py
@@ -33,7 +33,7 @@ import argparse
 import numpy
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
diff --git a/pythonPackages/msaslaps/maritime/a2cvboyStub.py b/pythonPackages/msaslaps/maritime/a2cvboyStub.py
index 8f42369469..4261afed29 100644
--- a/pythonPackages/msaslaps/maritime/a2cvboyStub.py
+++ b/pythonPackages/msaslaps/maritime/a2cvboyStub.py
@@ -34,7 +34,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/pythonPackages/msaslaps/maritime/a2gtboyStub.py b/pythonPackages/msaslaps/maritime/a2gtboyStub.py
index 64e9d47639..7dbd136ae3 100644
--- a/pythonPackages/msaslaps/maritime/a2gtboyStub.py
+++ b/pythonPackages/msaslaps/maritime/a2gtboyStub.py
@@ -34,7 +34,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/pythonPackages/msaslaps/metar/a2cvmtrStub.py b/pythonPackages/msaslaps/metar/a2cvmtrStub.py
index 43bfcc5268..ea42e598f3 100644
--- a/pythonPackages/msaslaps/metar/a2cvmtrStub.py
+++ b/pythonPackages/msaslaps/metar/a2cvmtrStub.py
@@ -36,7 +36,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/pythonPackages/msaslaps/metar/a2gtmtrStub.py b/pythonPackages/msaslaps/metar/a2gtmtrStub.py
index 55faf8393a..894808e992 100644
--- a/pythonPackages/msaslaps/metar/a2gtmtrStub.py
+++ b/pythonPackages/msaslaps/metar/a2gtmtrStub.py
@@ -36,7 +36,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/pythonPackages/msaslaps/profiler/a2gtprofStub.py b/pythonPackages/msaslaps/profiler/a2gtprofStub.py
index 560cff5aca..14b2121a4a 100644
--- a/pythonPackages/msaslaps/profiler/a2gtprofStub.py
+++ b/pythonPackages/msaslaps/profiler/a2gtprofStub.py
@@ -36,7 +36,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():    
diff --git a/pythonPackages/msaslaps/radar/a2invradStub.py b/pythonPackages/msaslaps/radar/a2invradStub.py
index 15738b1490..5b7c698040 100644
--- a/pythonPackages/msaslaps/radar/a2invradStub.py
+++ b/pythonPackages/msaslaps/radar/a2invradStub.py
@@ -37,7 +37,7 @@ import sys
 from datetime import datetime
 from datetime import timedelta
 
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level
 
diff --git a/pythonPackages/msaslaps/radar/a2radcommon.py b/pythonPackages/msaslaps/radar/a2radcommon.py
index 12002617c2..0199c20a6e 100644
--- a/pythonPackages/msaslaps/radar/a2radcommon.py
+++ b/pythonPackages/msaslaps/radar/a2radcommon.py
@@ -37,14 +37,14 @@ import sys
 
 from datetime import datetime
 from datetime import timedelta
-from ufpy import ThriftClient
+from awips import ThriftClient
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.radar.request import GetRadarDataRecordRequest
 
 def get_default_host():
-    from ufpy.dataaccess import DataAccessLayer
+    from awips.dataaccess import DataAccessLayer
     return DataAccessLayer.THRIFT_HOST
 
 
diff --git a/pythonPackages/msaslaps/raobs/a2gtraobStub.py b/pythonPackages/msaslaps/raobs/a2gtraobStub.py
index ff5bb2e25d..c6faa24513 100644
--- a/pythonPackages/msaslaps/raobs/a2gtraobStub.py
+++ b/pythonPackages/msaslaps/raobs/a2gtraobStub.py
@@ -34,7 +34,7 @@ import argparse
 import sys
 
 from datetime import datetime
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/pythonPackages/msaslaps/satellite/a2invsatStub.py b/pythonPackages/msaslaps/satellite/a2invsatStub.py
index fcd4fc8632..95dfd9b83f 100644
--- a/pythonPackages/msaslaps/satellite/a2invsatStub.py
+++ b/pythonPackages/msaslaps/satellite/a2invsatStub.py
@@ -32,7 +32,7 @@ import argparse
 import numpy
 import sys
 
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 
 def get_args():
     parser = argparse.ArgumentParser(conflict_handler="resolve")
diff --git a/pythonPackages/msaslaps/satellite/a2rdsatStub.py b/pythonPackages/msaslaps/satellite/a2rdsatStub.py
index 4ee8b1aded..4306e16bda 100644
--- a/pythonPackages/msaslaps/satellite/a2rdsatStub.py
+++ b/pythonPackages/msaslaps/satellite/a2rdsatStub.py
@@ -44,7 +44,7 @@ import sys
 
 from datetime import datetime
 from datetime import timedelta
-from ufpy.dataaccess import DataAccessLayer
+from awips.dataaccess import DataAccessLayer
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 
 def get_args():
diff --git a/rpms/awips2.ade/tar.ade/build.sh b/rpms/awips2.ade/tar.ade/build.sh
index d9e9080ddc..7026019b6f 100755
--- a/rpms/awips2.ade/tar.ade/build.sh
+++ b/rpms/awips2.ade/tar.ade/build.sh
@@ -28,7 +28,6 @@ AWIPS2_SITE_PKG_RPMS=\
    'awips2-python-scientific-2.8-2.i386.rpm' \
    'awips2-python-scipy-0.8.0-2.i386.rpm' \
    'awips2-python-tables-2.1.2-2.i386.rpm' \
-   'awips2-python-thrift-20080411p1-2.i386.rpm' \
    'awips2-python-tpg-3.1.2-2.i386.rpm' \
    'awips2-python-werkzeug-0.6.2-2.i386.rpm' \
 )
@@ -47,58 +46,12 @@ do
    cp -v ${CORE_RPM_DIR}/${rpm} /tmp/awips2-ade-${CURRENT_DATE}
 done
 
-# Copy ufpy and dynamicserialize
-# Determine where ufpy and dynamicserialize are located first. They should either
-# be in the integration repository or the workspace of RPMBuildNoDeploy-Delivery.
-INT_REPO="/var/www/html/repo/awips2-int/i386/python.site-packages"
-DEL_WORKSPACE="/usr/share/tomcat5/.hudson/jobs/RPMBuildNoDeploy-Delivery/workspace/var/www/html/repo/awips2-int/i386/python.site-packages"
-UFPY_FOUND="N"
-DYNAMICSERIALIZE_FOUND="N"
-
-UFPY_RPM="awips2-python-ufpy-${CURRENT_VERSION}-${CURRENT_RELEASE}.i386.rpm"
-DYNAMICSERIALIZE_RPM="awips2-python-dynamicserialize-${CURRENT_VERSION}-${CURRENT_RELEASE}.i386.rpm"
-
-# Check the integration repository first.
-if [ -f ${INT_REPO}/${UFPY_RPM} ]; then
-   cp -v ${INT_REPO}/${UFPY_RPM} /tmp/awips2-ade-${CURRENT_DATE}
-   UFPY_FOUND="Y"
-fi
-
-if [ -f ${INT_REPO}/${DYNAMICSERIALIZE_RPM} ]; then
-   cp -v ${INT_REPO}/${DYNAMICSERIALIZE_RPM} /tmp/awips2-ade-${CURRENT_DATE}
-   DYNAMICSERIALIZE_FOUND="Y"
-fi
-
-# Check the workspace next - if the rpm was not found in the repo.
-if [ "${UFPY_FOUND}" = "N" ]; then
-   if [ ! -f ${DEL_WORKSPACE}/${UFPY_RPM} ]; then
-      echo "ERROR: Unable to find - ${UFPY_RPM}."
-      echo "Unable To Continue ... Terminating."
-      exit 1
-   fi
-   cp -v ${DEL_WORKSPACE}/${UFPY_RPM} /tmp/awips2-ade-${CURRENT_DATE}
-fi
-
-if [ "${DYNAMICSERIALIZE_FOUND}" = "N" ]; then
-   if [ ! -f ${DEL_WORKSPACE}/${DYNAMICSERIALIZE_RPM} ]; then
-      echo "ERROR: Unable to find - ${DYNAMICSERIALIZE_RPM}."
-      echo "Unable To Continue ... Terminating."
-      exit 1
-   fi
-   cp -v ${DEL_WORKSPACE}/${DYNAMICSERIALIZE_RPM} /tmp/awips2-ade-${CURRENT_DATE}
-fi
 
 # Copy the installation / removal scripts.
 cp -v ${WORKSPACE_DIR}/Installer.rpm/awips2.ade/tar.ade/scripts/* \
    /tmp/awips2-ade-${CURRENT_DATE}
 chmod a+x /tmp/awips2-ade-${CURRENT_DATE}/*.sh
 
-# Update the installation script.
-perl -p -i -e "s/PY_DYNAMICSERIALIZE=/PY_DYNAMICSERIALIZE=${DYNAMICSERIALIZE_RPM}/g" \
-   /tmp/awips2-ade-${CURRENT_DATE}/ade_quick_install.sh
-perl -p -i -e "s/PY_UFPY=/PY_UFPY=${UFPY_RPM}/g" \
-   /tmp/awips2-ade-${CURRENT_DATE}/ade_quick_install.sh
-
 cd /tmp
 # Remove any existing tar files
 if [ -f awips2-ade-${CURRENT_DATE}.tar ]; then
@@ -113,4 +66,4 @@ if [ ! "${RC}" = "0" ]; then
    exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh
index 1b44e89288..4a28fe65ca 100644
--- a/rpms/build/common/lookupRPM.sh
+++ b/rpms/build/common/lookupRPM.sh
@@ -42,10 +42,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${python_site__dir}/Installer.cherrypy"
       return 0
    fi
-   if [ "${1}" = "awips2-python-dynamicserialize" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.dynamicserialize"
-      return 0
-   fi
    if [ "${1}" = "awips2-python-h5py" ]; then
       export RPM_SPECIFICATION="${python_site__dir}/Installer.h5py/"
       return 0
@@ -128,10 +124,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${python_site__dir}/Installer.tables"
       return 0
    fi
-   if [ "${1}" = "awips2-python-thrift" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.thrift"
-      return 0
-   fi
    if [ "${1}" = "awips2-python-tpg" ]; then
       export RPM_SPECIFICATION="${python_site__dir}/Installer.tpg"
       return 0
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index e6b871cf3a..0c820fc902 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -89,7 +89,7 @@ if [ "${1}" = "-python-qpid" ]; then
 #   buildRPM "awips2-python-qpid"
 #   buildRPM "awips2-python"
 #   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
 #   buildRPM "awips2-python-nose"
 #   buildRPM "awips2-python-numpy"
 #   buildRPM "awips2-python-h5py"
@@ -101,9 +101,7 @@ if [ "${1}" = "-python-qpid" ]; then
 #   buildRPM "awips2-python-scientific"
 #   buildRPM "awips2-python-scipy"
 #   buildRPM "awips2-python-tables"
-#   buildRPM "awips2-python-thrift"
 #   buildRPM "awips2-python-tpg"
-#   buildRPM "awips2-python-python-awips"
 #   buildRPM "awips2-python-werkzeug"
 #   buildRPM "awips2-python-pygtk"
 #   buildRPM "awips2-python-pycairo"
@@ -168,8 +166,7 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-ncep-database"
    buildRPM "awips2-gfesuite-client"
    buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-python-awips"
+   buildRPM "awips2-python-awips"
 
    buildRPM "awips2-adapt-native"
    buildRPM "awips2-aviation-shared"
@@ -207,7 +204,7 @@ if [ "${1}" = "-full" ]; then
    fi
    buildRPM "awips2-python"
    buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
@@ -220,9 +217,7 @@ if [ "${1}" = "-full" ]; then
    buildRPM "awips2-python-scientific"
    buildRPM "awips2-python-scipy"
    buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-pycairo"
@@ -281,7 +276,7 @@ if [ "${1}" = "-ade" ]; then
    buildRPM "awips2-ant"
    buildRPM "awips2-python"
    buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
@@ -294,9 +289,7 @@ if [ "${1}" = "-ade" ]; then
    buildRPM "awips2-python-scientific"
    buildRPM "awips2-python-scipy"
    buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-pycairo"
@@ -379,7 +372,7 @@ if [ "${1}" = "-edex" ]; then
    buildRPM "awips2-gfesuite-client"
    buildRPM "awips2-gfesuite-server"
  # buildRPM "awips2-ncep-database"
- # buildRPM "awips2-python-dynamicserialize"
+ # buildRPM "awips2-python-awips"
    buildEDEX
    if [ $? -ne 0 ]; then
       exit 1
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index 6974afed6c..eafe1b100e 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -146,8 +146,8 @@ if [ "${1}" = "-python" ]; then
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-qpid"
 
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
    buildRPM "awips2-python-nose"
@@ -161,7 +161,6 @@ if [ "${1}" = "-python" ]; then
    buildRPM "awips2-python-tables"
    buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-pycairo"
@@ -183,7 +182,7 @@ if [ "${1}" = "-64bit" ]; then
    fi
    buildRPM "awips2-python"
    buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
@@ -198,7 +197,6 @@ if [ "${1}" = "-64bit" ]; then
    buildRPM "awips2-python-tables"
    buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-pycairo"
@@ -236,8 +234,7 @@ if [ "${1}" = "-rh6" ]; then
    buildRPM "awips2-python-tables"
    buildRPM "awips2-python-pmw"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-pycairo"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-shapely"
@@ -323,8 +320,7 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-ncep-database"
    buildRPM "awips2-gfesuite-client"
    buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-python-awips"
+   buildRPM "awips2-python-awips"
 
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
@@ -387,9 +383,8 @@ if [ "${1}" = "-full" ]; then
 #   fi
 #   buildQPID
 #   buildRPM "awips2-python-jimporter"
-#   buildRPM "awips2-python-python-awips"
 #   buildRPM "awips2-python-cherrypy"
-#   buildRPM "awips2-python-dynamicserialize"
+#   buildRPM "awips2-python-awips"
 #   buildRPM "awips2-python-h5py"
 #   buildRPM "awips2-python-matplotlib"
 #   buildRPM "awips2-python-nose"
@@ -458,7 +453,7 @@ if [ "${1}" = "-ade" ]; then
    buildRPM "awips2-ant"
    buildRPM "awips2-python"
    buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
+   buildRPM "awips2-python-awips"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
@@ -473,7 +468,6 @@ if [ "${1}" = "-ade" ]; then
    buildRPM "awips2-python-tables"
    buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-python-awips"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-pycairo"
@@ -576,7 +570,7 @@ if [ "${1}" = "-edex" ]; then
    #if [ $? -ne 0 ]; then
    #   exit 1
    #fi
-   #buildRPM "awips2-python-dynamicserialize"
+   #buildRPM "awips2-python-awips"
 
    exit 0
 fi
@@ -591,7 +585,7 @@ if [ "${1}" = "-custom" ]; then
    #buildRPM "awips2-common-base"
    #buildRPM "awips2-gfesuite-client"
    #buildRPM "awips2-gfesuite-server"
-   #buildRPM "awips2-python-dynamicserialize"
+   #buildRPM "awips2-python-awips"
    #buildRPM "awips2-alertviz"
    #buildRPM "awips2-python"
    #buildRPM "awips2-alertviz"
diff --git a/rpms/python.site-packages/Installer.dynamicserialize/component.spec b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
deleted file mode 100644
index a6ac6b23dd..0000000000
--- a/rpms/python.site-packages/Installer.dynamicserialize/component.spec
+++ /dev/null
@@ -1,70 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-
-%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
-
-#
-# AWIPS II Python dynamicserialize Spec File
-#
-Name: awips2-python-dynamicserialize
-Summary: AWIPS II Python dynamicserialize Distribution
-Version: %{_component_version}
-Release: 1
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: noarch
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-requires: awips2-python
-requires: awips2-python-thrift
-provides: awips2-python-dynamicserialize
-
-%description
-AWIPS II Python dynamicserialize Site-Package - 64-bit.
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "%{_build_root}" = "" ]
-then
-   echo "A Build Root has not been specified."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-rm -rf %{_build_root}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-%build
-
-%install
-mkdir -p %{_build_root}/awips2/python/lib/python2.7/site-packages/dynamicserialize
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-DYNAMICSERIALIZE_SRC_DIR="%{_python_pkgs_dir}/dynamicserialize"
-
-cp -rv ${DYNAMICSERIALIZE_SRC_DIR}/* \
-   %{_build_root}/awips2/python/lib/python2.7/site-packages/dynamicserialize
-   
-%pre
-
-%post
-
-%preun
-
-%postun
-
-%clean
-rm -rf %{_build_root}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2/python/lib/python2.7/site-packages
-/awips2/python/lib/python2.7/site-packages/*
diff --git a/rpms/python.site-packages/deploy.builder/build.sh b/rpms/python.site-packages/deploy.builder/build.sh
index 75e8b4a46b..b56d392cf4 100644
--- a/rpms/python.site-packages/deploy.builder/build.sh
+++ b/rpms/python.site-packages/deploy.builder/build.sh
@@ -103,6 +103,5 @@ touch ${RPM_SITE_PACKAGE_LOG_FILE}
 # For Now, We Will Only Build The Important RPMs. Will Add An Env Flag That Can Be
 # Set To Force A Build Of Everything.
 buildRPM "Installer.python-awips"
-buildRPM "Installer.dynamicserialize"
 buildRPM "Installer.cherrpy"
 buildRPM "Installer.h5py"