diff --git a/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp b/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp
index 3d447e0ca0..e7d81966a6 100644
--- a/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp
+++ b/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp
@@ -21,7 +21,6 @@
 #include "RimSummaryPlotCollection.h"
 #include "RimWellPathCollection.h"
 
-#include "cafAssert.h"
 #include "cafPdmUiItem.h"
 #include "cafSelectionManager.h"
 
@@ -58,7 +57,7 @@ void RicDeleteSubItemsFeature::onActionTriggered(bool isChecked)
     std::vector<caf::PdmUiItem*> items;
     caf::SelectionManager::instance()->selectedItems(items);
 
-    CAF_ASSERT(items.size() > 0);
+    CVF_ASSERT(items.size() > 0);
 
     for (auto item : items)
     {
diff --git a/Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemFeature.cpp b/Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemFeature.cpp
index 298d33f7b7..e60bc9f1d0 100644
--- a/Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemFeature.cpp
+++ b/Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemFeature.cpp
@@ -37,7 +37,6 @@
 
 #include "cafCmdAddItemFeature.h"
 
-#include "cafAssert.h"
 #include "cafCmdAddItemExec.h"
 #include "cafCmdAddItemExecData.h"
 #include "cafCmdFeatureManager.h"
@@ -49,6 +48,8 @@
 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
 
+#include "cvfAssert.h"
+
 #include <QAction>
 
 
@@ -108,7 +109,7 @@ void CmdAddItemFeature::onActionTriggered(bool isChecked)
         }
         else
         {
-            CAF_ASSERT(0);
+            CVF_ASSERT(0);
         }
     }
 }