diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae368ae..0190eca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,9 @@ release.
 -->
 ### unreleased
 
+### Fixed
+- Fixed LRO smithed kernels for north and south pole database by moving them from lroc to moc [#124](https://github.com/DOI-USGS/SpiceQL/pull/124)
+
 ### 1.3.0
 
 ### Changed
diff --git a/SpiceQL/db/lro.json b/SpiceQL/db/lro.json
index af28652..22ccd7f 100644
--- a/SpiceQL/db/lro.json
+++ b/SpiceQL/db/lro.json
@@ -18,7 +18,10 @@
   "moc" : {
       "ck" : {
           "reconstructed" : {
-              "kernels": ["moc42r?_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
+            "kernels": ["moc42r?_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
+          },
+          "smithed" : {
+            "kernels": ["LROC_NPOLE_2017Merged_Lidar2Image_.*_ck.bc$","LRONAC_SPole_.*_ck.bc$"]
           }
       },
       "spk" : {
@@ -35,9 +38,6 @@
     "ck" : {
       "reconstructed" : {
         "kernels" : [ "soc31_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$", "lrolc_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
-      },
-      "smithed" : {
-        "kernels": ["LROC_NPOLE_2017Merged_Lidar2Image_.*_ck.bc$","LRONAC_SPole_.*_ck.bc$"]
       }
     },
     "ik" : {
diff --git a/SpiceQL/tests/Fixtures.cpp b/SpiceQL/tests/Fixtures.cpp
index 056b418..ca1aa2a 100644
--- a/SpiceQL/tests/Fixtures.cpp
+++ b/SpiceQL/tests/Fixtures.cpp
@@ -355,7 +355,11 @@ void LroKernelSet::SetUp() {
     "moc" : {
         "ck" : {
             "reconstructed" : {
-                "kernels": ["soc31.*.bc", "lrolc.*.bc"]
+                "kernels": [
+                "soc31.*.bc", 
+                "lrolc.*.bc", 
+                "LROC_NPOLE_.*_ck.bc",
+                "LRONAC_SPole_.*_ck.bc"]
             },
             "deps" : {
             "sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
@@ -363,25 +367,29 @@ void LroKernelSet::SetUp() {
             }
         },
         "spk" : {
-        "reconstructed" : {
-            "kernels" : ["fdf29_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp", "fdf29r_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp"]
-        },
-        "smithed" : {
-            "kernels" : ["LRO_.*_GRGM660.*.bsp", "LRO_.*_GRGM900C.*.BSP"]
-        },
-        "deps" : {
-            "sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
-            "objs" : ["/base/lsk", "/moc/sclk"]
-        }
+          "reconstructed" : {
+              "kernels" : ["fdf29_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp", "fdf29r_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp"]
+          },
+          "smithed" : {
+              "kernels" : [
+                "LRO_.*_GRGM660.*.bsp",
+                "LRO_.*_GRGM900C.*.BSP",
+                "LROC_NPOLE_.*_spk.bsp",
+                "LRONAC_SPole_.*_spk.bsp"]
+          },
+          "deps" : {
+              "sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
+              "objs" : ["/base/lsk", "/moc/sclk"]
+          }
         },
         "sclk" : {
-        "kernels" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"]
+          "kernels" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"]
         },
         "fk" : {
-        "kernels" : ["lro_frames_[0-9]{7}_v[0-9]{2}.tf"]
+          "kernels" : ["lro_frames_[0-9]{7}_v[0-9]{2}.tf"]
         },
         "ik" : {
-        "kernels" : ["lro_instruments_v[0-9]{2}.ti"]
+          "kernels" : ["lro_instruments_v[0-9]{2}.ti"]
         }
     }
 })"_json;
diff --git a/SpiceQL/tests/QueryTests.cpp b/SpiceQL/tests/QueryTests.cpp
index a0c3b76..645d33f 100644
--- a/SpiceQL/tests/QueryTests.cpp
+++ b/SpiceQL/tests/QueryTests.cpp
@@ -247,7 +247,20 @@ TEST_F(IsisDataDirectory, FunctionalTestLroConf) {
   // check a kernel from each regex exists in their quality groups
   vector<string> kernelToCheck =  SpiceQL::getKernelsAsVector(res.at("moc").at("ck").at("reconstructed").at("kernels"));
   vector<string> expected = {tempDir/"lro"/"kernels"/ "ck" / "moc42r_2016305_2016336_v01.bc"};
-  SPDLOG_DEBUG("Checking CKs");
+  SPDLOG_DEBUG("Checking Recon CKs");
+  for (auto &e : expected) { 
+    auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
+    if (it == kernelToCheck.end()) {
+      throw runtime_error(e+" was not found in the kernel results");
+    }
+  }
+
+  SPDLOG_DEBUG("Checking Smithed CKs");
+  kernelToCheck =  SpiceQL::getKernelsAsVector(res.at("moc").at("ck").at("smithed").at("kernels"));
+  expected = {
+    tempDir/"lro"/"kernels"/ "ck" /"LROC_NPOLE_2017Merged_Lidar2Image_Left_ck.bc",
+    tempDir/"lro"/"kernels"/ "ck" /"LRONAC_SPole_LE_2009_ck.bc"
+  };
   for (auto &e : expected) { 
     auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
     if (it == kernelToCheck.end()) {
@@ -268,8 +281,10 @@ TEST_F(IsisDataDirectory, FunctionalTestLroConf) {
   SPDLOG_DEBUG("Checking Smithed SPKs");
   kernelToCheck = getKernelsAsVector(res.at("moc").at("spk").at("smithed")); 
   expected = {tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_05_201308_GRGM660PRIMAT270.bsp", 
-              tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_16_201406_GRGM900C_L600.BSP"};
-
+              tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_16_201406_GRGM900C_L600.BSP",
+              tempDir/"lro"/"kernels"/ "spk" /"LROC_NPOLE_2017Merged_Lidar2Image_Left_spk.bsp",
+              tempDir/"lro"/"kernels"/ "spk" /"LRONAC_SPole_RE_2013_spk.bsp"
+  };
   for (auto &e : expected) { 
     auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
     if (it == kernelToCheck.end()) {
diff --git a/SpiceQL/tests/data/isisKernelList.txt b/SpiceQL/tests/data/isisKernelList.txt
index 8b169b0..2c8cd21 100644
--- a/SpiceQL/tests/data/isisKernelList.txt
+++ b/SpiceQL/tests/data/isisKernelList.txt
@@ -12220,6 +12220,30 @@ lro/kernels/ck/lrolc_2021151_2021182_v01.bc
 lro/kernels/ck/lrolc_2019334_2020001_v01.bc
 lro/kernels/ck/lrolc_2013273_2013305_v06.bc
 lro/kernels/ck/moc42r_2017181_2017213_v01.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2009_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2010_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2011_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2012_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2013_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2014_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2009_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2010_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2011_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2012_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2013_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2014_ck.bc
+lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_ck.bc
+lro/kernels/ck/LRONAC_SPole_LE_2009_ck.bc
+lro/kernels/ck/LRONAC_SPole_LE_2010_ck.bc
+lro/kernels/ck/LRONAC_SPole_LE_2011_ck.bc
+lro/kernels/ck/LRONAC_SPole_LE_2012_ck.bc
+lro/kernels/ck/LRONAC_SPole_LE_2013_ck.bc
+lro/kernels/ck/LRONAC_SPole_RE_2009_ck.bc
+lro/kernels/ck/LRONAC_SPole_RE_2010_ck.bc
+lro/kernels/ck/LRONAC_SPole_RE_2011_ck.bc
+lro/kernels/ck/LRONAC_SPole_RE_2012_ck.bc
+lro/kernels/ck/LRONAC_SPole_RE_2013_ck.bc
 lro/kernels/sclk/lro_clkcor_2021271_v00.tsc
 lro/kernels/sclk/lro_clkcor_2021299_v00.tsc
 lro/kernels/sclk/lro_clkcor_2021265_v00.tsc
@@ -12509,6 +12533,30 @@ lro/kernels/spk/LRO_ES_16_201406_GRGM900C_L600.BSP
 lro/kernels/spk/fdf29_2021327_2021328_b01.bsp
 lro/kernels/spk/LRO_ES_05_201308_GRGM660PRIMAT270.bsp
 lro/kernels/spk/fdf29r_2014335_2015001_v01.bsp
+lro/kernels/spk/LRONAC_SPole_LE_2009_spk.bsp
+lro/kernels/spk/LRONAC_SPole_LE_2010_spk.bsp
+lro/kernels/spk/LRONAC_SPole_LE_2011_spk.bsp
+lro/kernels/spk/LRONAC_SPole_LE_2012_spk.bsp
+lro/kernels/spk/LRONAC_SPole_LE_2013_spk.bsp
+lro/kernels/spk/LRONAC_SPole_RE_2009_spk.bsp
+lro/kernels/spk/LRONAC_SPole_RE_2010_spk.bsp
+lro/kernels/spk/LRONAC_SPole_RE_2011_spk.bsp
+lro/kernels/spk/LRONAC_SPole_RE_2012_spk.bsp
+lro/kernels/spk/LRONAC_SPole_RE_2013_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2009_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2010_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2011_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2012_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2013_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2014_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2009_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2010_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2011_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2012_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2013_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2014_spk.bsp
+lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_spk.bsp
 lro/kernels/fk/lro_frames_2009322_v01.tf
 lro/kernels/fk/lro_frames_2010277_v01.tf
 lro/kernels/fk/lro_frames_2009171_v01.tf