diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
index 61795f331096f3eff3299d8043a661f343bc35fc..c591e6d1cadebfc2c29d76636bc78b8bedd655ac 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
@@ -33,7 +33,7 @@ public final class VocabularyListDeletionConfirmationDialog extends
         AbstractDataListPermanentDeletionConfirmationDialog<TableModelRowWithObject<Vocabulary>>
 {
 
-    private final IViewContext<ICommonClientServiceAsync> viewContext;
+    private final IViewContext<ICommonClientServiceAsync> localViewContext;
 
     public VocabularyListDeletionConfirmationDialog(
             IViewContext<ICommonClientServiceAsync> viewContext,
@@ -41,13 +41,13 @@ public final class VocabularyListDeletionConfirmationDialog extends
             AbstractAsyncCallback<Void> callback)
     {
         super(viewContext, vocabularies, callback);
-        this.viewContext = viewContext;
+        this.localViewContext = viewContext;
     }
 
     @Override
     protected void executeDeletion(AsyncCallback<Void> deletionCallback)
     {
-        viewContext.getCommonService().deleteVocabularies(TechId.createList(data),
+        localViewContext.getCommonService().deleteVocabularies(TechId.createList(data),
                 reason.getValue(), deletionCallback);
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
index d1f68993cfb62e8d977de4fdb98101842be68b6c..6e881fd358f742b860782558c1ff14a231e12d6b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
@@ -181,9 +181,9 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
             }
         }
 
-        private Status isInstanceEtlServer(PersonPE person)
+        private Status isInstanceEtlServer(PersonPE aPerson)
         {
-            for (RoleAssignmentPE role : person.getRoleAssignments())
+            for (RoleAssignmentPE role : aPerson.getRoleAssignments())
             {
                 if (role.getSpace() == null)
                 {
@@ -196,7 +196,7 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
             }
             return Status.createError(false,
                     "None of method roles '[INSTANCE_ETL_SERVER, INSTANCE_ADMIN]' could be found in roles of user '"
-                            + person.getUserId() + "'.");
+                            + aPerson.getUserId() + "'.");
         }
 
         private Status evaluateExperimentUpdatePredicate()