diff --git a/Console/Command/ResetCommand.php b/Console/Command/ResetCommand.php
index 894a1b95..90151176 100644
--- a/Console/Command/ResetCommand.php
+++ b/Console/Command/ResetCommand.php
@@ -108,7 +108,7 @@ private function resetConfig()
     {
         $this->resourceConnection->getConnection()->delete(
             $this->resourceConnection->getTableName('core_config_data'),
-            "path LIKE '" . \Yotpo\Yotpo\Helper\Data::XML_PATH_ALL . "/%'"
+            "path LIKE '" . \Yotpo\Yotpo\Model\Config::XML_PATH_YOTPO_ALL . "/%'"
         );
     }
 }
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
index c6ac4301..ba986837 100644
--- a/Setup/UpgradeData.php
+++ b/Setup/UpgradeData.php
@@ -81,7 +81,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 
             // Clear config values for the 'default' & 'website' scopes
             $setup->getConnection()->delete(
-                $setup->getConnection()->getTableName('core_config_data'),
+                $setup->getTable('core_config_data'),
                 "path IN ('" . implode("','", [YotpoConfig::XML_PATH_YOTPO_APP_KEY, YotpoConfig::XML_PATH_YOTPO_SECRET, YotpoConfig::XML_PATH_YOTPO_ENABLED]) . "') AND scope != '" . ScopeInterface::SCOPE_STORES . "'"
             );