diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java
index 2ad905d1..da1abf02 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java
@@ -27,20 +27,20 @@ public class Directory extends FsNode {
     }
 
     public <R> R runReadLocked(DirectoryFunction<R> fn) {
-        lock.readLock().lock();
+        _lock.readLock().lock();
         try {
             return fn.apply(_fsNodeData, _directoryData);
         } finally {
-            lock.readLock().unlock();
+            _lock.readLock().unlock();
         }
     }
 
     public <R> R runWriteLocked(DirectoryFunction<R> fn) {
-        lock.writeLock().lock();
+        _lock.writeLock().lock();
         try {
             return fn.apply(_fsNodeData, _directoryData);
         } finally {
-            lock.writeLock().unlock();
+            _lock.writeLock().unlock();
         }
     }
 
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/File.java b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/File.java
index 4c841be8..aca259d7 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/File.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/File.java
@@ -29,20 +29,20 @@ public class File extends FsNode {
     }
 
     public <R> R runReadLocked(FileFunction<R> fn) {
-        lock.readLock().lock();
+        _lock.readLock().lock();
         try {
             return fn.apply(_fsNodeData, _fileData);
         } finally {
-            lock.readLock().unlock();
+            _lock.readLock().unlock();
         }
     }
 
     public <R> R runWriteLocked(FileFunction<R> fn) {
-        lock.writeLock().lock();
+        _lock.writeLock().lock();
         try {
             return fn.apply(_fsNodeData, _fileData);
         } finally {
-            lock.writeLock().unlock();
+            _lock.writeLock().unlock();
         }
     }
 }
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/FsNode.java b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/FsNode.java
index 0cb62ece..1c2f81d8 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/FsNode.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/files/objects/FsNode.java
@@ -46,20 +46,20 @@ public abstract class FsNode extends JObject {
     }
 
     public <R> R runReadLocked(FsNodeFunction<R> fn) {
-        lock.readLock().lock();
+        _lock.readLock().lock();
         try {
             return fn.apply(_fsNodeData);
         } finally {
-            lock.readLock().unlock();
+            _lock.readLock().unlock();
         }
     }
 
     public <R> R runWriteLocked(Function<FsNodeData, R> fn) {
-        lock.writeLock().lock();
+        _lock.writeLock().lock();
         try {
             return fn.apply(_fsNodeData);
         } finally {
-            lock.writeLock().unlock();
+            _lock.writeLock().unlock();
         }
     }
 
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
index d1603e06..355b1b13 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
@@ -10,15 +10,15 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 public abstract class JObject implements Serializable {
     public abstract String getName();
 
-    protected final ReadWriteLock lock = new ReentrantReadWriteLock();
+    protected final ReadWriteLock _lock = new ReentrantReadWriteLock();
 
     @Serial
     private void writeObject(ObjectOutputStream oos) throws IOException {
-        lock.readLock().lock();
+        _lock.readLock().lock();
         try {
             oos.defaultWriteObject();
         } finally {
-            lock.readLock().unlock();
+            _lock.readLock().unlock();
         }
     }
 }