diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
index bd13d041ab..5bc496f735 100644
--- a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
@@ -278,14 +278,14 @@ void RimCommandIssueFieldChanged::childObjects(caf::PdmObject* pdmObject, std::v
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObjectHandle* pdmObject, const QString& objectName)
+caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObjectHandle* pdmObject, const QString& name)
 {
     std::vector<caf::PdmFieldHandle*> fields;
     pdmObject->fields(fields);
 
     caf::PdmUiObjectHandle* uiObjectHandle = uiObj(pdmObject);
 
-    if (uiObjectHandle && uiObjectHandle->uiName() == objectName)
+    if (uiObjectHandle && uiObjectHandle->uiName() == name)
     {
         return pdmObject;
     }
@@ -299,7 +299,7 @@ caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObje
 
             for (size_t cIdx = 0; cIdx < children.size(); cIdx++)
             {
-                PdmObjectHandle* candidateObj = findObjectByName(children[cIdx], objectName);
+                PdmObjectHandle* candidateObj = findObjectByName(children[cIdx], name);
                 if (candidateObj)
                 {
                     return candidateObj;
diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.h b/ApplicationCode/ProjectDataModel/RimCommandObject.h
index 19bb199619..60ab866f98 100644
--- a/ApplicationCode/ProjectDataModel/RimCommandObject.h
+++ b/ApplicationCode/ProjectDataModel/RimCommandObject.h
@@ -93,7 +93,7 @@ public:
 
 private:
     void childObjects(caf::PdmObject* pdmObject, std::vector<caf::PdmObjectHandle*>& children);
-    caf::PdmObjectHandle* findObjectByName(caf::PdmObjectHandle* root, const QString& objectName);
+    caf::PdmObjectHandle* findObjectByName(caf::PdmObjectHandle* root, const QString& name);
     caf::PdmFieldHandle* findFieldByKeyword(caf::PdmObjectHandle* pdmObject, const QString& fieldName);
 
 };
diff --git a/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp b/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
index aad10e6d87..309b17fb3d 100644
--- a/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
@@ -110,9 +110,9 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
             }
         }
 
-        for (Rim3dView* view : views)
+        for (Rim3dView* rim3dView : views)
         {
-            RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(view, &options);
+            RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(rim3dView, &options);
         }
     }
     else if (fieldNeedingOptions == &eclipseResultType)