diff --git a/wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp b/wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp
index 7357f13a..0e51807f 100644
--- a/wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <scwx/awips/message.hpp>
-#include <scwx/wsr88d/rpg/rpg_types.hpp>
+#include <scwx/wsr88d/wsr88d_types.hpp>
 
 #include <cstdint>
 #include <memory>
diff --git a/wxdata/include/scwx/wsr88d/rpg/rpg_types.hpp b/wxdata/include/scwx/wsr88d/wsr88d_types.hpp
similarity index 96%
rename from wxdata/include/scwx/wsr88d/rpg/rpg_types.hpp
rename to wxdata/include/scwx/wsr88d/wsr88d_types.hpp
index 85679634..428f3765 100644
--- a/wxdata/include/scwx/wsr88d/rpg/rpg_types.hpp
+++ b/wxdata/include/scwx/wsr88d/wsr88d_types.hpp
@@ -6,8 +6,6 @@ namespace scwx
 {
 namespace wsr88d
 {
-namespace rpg
-{
 
 enum class DataLevelCode
 {
@@ -58,6 +56,5 @@ enum class DataLevelCode
 const std::string& GetDataLevelCodeName(DataLevelCode dataLevelCode);
 const std::string& GetDataLevelCodeShortName(DataLevelCode dataLevelCode);
 
-} // namespace rpg
 } // namespace wsr88d
 } // namespace scwx
diff --git a/wxdata/source/scwx/wsr88d/rpg/rpg_types.cpp b/wxdata/source/scwx/wsr88d/wsr88d_types.cpp
similarity index 98%
rename from wxdata/source/scwx/wsr88d/rpg/rpg_types.cpp
rename to wxdata/source/scwx/wsr88d/wsr88d_types.cpp
index eb90df08..4ea72757 100644
--- a/wxdata/source/scwx/wsr88d/rpg/rpg_types.cpp
+++ b/wxdata/source/scwx/wsr88d/wsr88d_types.cpp
@@ -1,4 +1,4 @@
-#include <scwx/wsr88d/rpg/rpg_types.hpp>
+#include <scwx/wsr88d/wsr88d_types.hpp>
 
 #include <unordered_map>
 
@@ -6,8 +6,6 @@ namespace scwx
 {
 namespace wsr88d
 {
-namespace rpg
-{
 
 static const std::unordered_map<DataLevelCode, std::string> dataLevelCodeName_ {
    {DataLevelCode::BadData, "Bad Data"},
@@ -109,6 +107,5 @@ const std::string& GetDataLevelCodeShortName(DataLevelCode dataLevelCode)
    return dataLevelCodeShortName_.at(dataLevelCode);
 }
 
-} // namespace rpg
 } // namespace wsr88d
 } // namespace scwx
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index 786e40a2..b70df1d8 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -93,11 +93,13 @@ set(SRC_UTIL source/scwx/util/environment.cpp
 set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp
                include/scwx/wsr88d/level3_file.hpp
                include/scwx/wsr88d/nexrad_file.hpp
-               include/scwx/wsr88d/nexrad_file_factory.hpp)
+               include/scwx/wsr88d/nexrad_file_factory.hpp
+               include/scwx/wsr88d/wsr88d_types.hpp)
 set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp
                source/scwx/wsr88d/level3_file.cpp
                source/scwx/wsr88d/nexrad_file.cpp
-               source/scwx/wsr88d/nexrad_file_factory.cpp)
+               source/scwx/wsr88d/nexrad_file_factory.cpp
+               source/scwx/wsr88d/wsr88d_types.cpp)
 set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/clutter_filter_bypass_map.hpp
                    include/scwx/wsr88d/rda/clutter_filter_map.hpp
                    include/scwx/wsr88d/rda/digital_radar_data.hpp
@@ -146,7 +148,6 @@ set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/ccb_header.hpp
                    include/scwx/wsr88d/rpg/radar_coded_message.hpp
                    include/scwx/wsr88d/rpg/radial_data_packet.hpp
                    include/scwx/wsr88d/rpg/raster_data_packet.hpp
-                   include/scwx/wsr88d/rpg/rpg_types.hpp
                    include/scwx/wsr88d/rpg/scit_forecast_data_packet.hpp
                    include/scwx/wsr88d/rpg/set_color_level_packet.hpp
                    include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp
@@ -186,7 +187,6 @@ set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ccb_header.cpp
                    source/scwx/wsr88d/rpg/radar_coded_message.cpp
                    source/scwx/wsr88d/rpg/radial_data_packet.cpp
                    source/scwx/wsr88d/rpg/raster_data_packet.cpp
-                   source/scwx/wsr88d/rpg/rpg_types.cpp
                    source/scwx/wsr88d/rpg/scit_forecast_data_packet.cpp
                    source/scwx/wsr88d/rpg/set_color_level_packet.cpp
                    source/scwx/wsr88d/rpg/special_graphic_symbol_packet.cpp