diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
index e881968f..cd484332 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
@@ -1,7 +1,6 @@
 package com.usatiuk.dhfs.storage.objects.api;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.storage.objects.data.Namespace;
 import com.usatiuk.dhfs.storage.objects.data.Object;
 import com.usatiuk.dhfs.storage.objects.repository.ObjectRepository;
 import io.quarkus.grpc.GrpcService;
@@ -33,7 +32,7 @@ public class DhfsObjectGrpcService implements DhfsObjectGrpc {
     @RunOnVirtualThread
     public Uni<WriteObjectReply> writeObject(WriteObjectRequest request) {
         objectRepository.writeObject(request.getNamespace(),
-                new Object(new Namespace(request.getNamespace()), request.getName(), request.getData().toByteArray()), false);
+                new Object(request.getNamespace(), request.getName(), request.getData().toByteArray()), false);
         return Uni.createFrom().item(WriteObjectReply.newBuilder().build());
     }
 
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java
deleted file mode 100644
index 45e7a2f1..00000000
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.usatiuk.dhfs.storage.objects.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-@Accessors(chain = true)
-@Getter
-@Setter
-@AllArgsConstructor
-public class Namespace {
-    final String _name;
-}
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
index 478ad90e..1373b496 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 @Setter
 @AllArgsConstructor
 public class Object {
-    final Namespace _namespace;
+    final String _namespace;
 
     final String _name;
     final byte[] _data;
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectRepositoryImpl.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectRepositoryImpl.java
index b1a5246f..599fe1e2 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectRepositoryImpl.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectRepositoryImpl.java
@@ -1,7 +1,6 @@
 package com.usatiuk.dhfs.storage.objects.jrepository;
 
 import com.usatiuk.dhfs.storage.DeserializationHelper;
-import com.usatiuk.dhfs.storage.objects.data.Namespace;
 import com.usatiuk.dhfs.storage.objects.data.Object;
 import com.usatiuk.dhfs.storage.objects.repository.ObjectRepository;
 import io.quarkus.logging.Log;
@@ -46,7 +45,7 @@ public class JObjectRepositoryImpl implements JObjectRepository {
     @Override
     public void writeJObject(String namespace, JObject object) {
         final var obj = new Object(
-                new Namespace(namespace),
+                namespace,
                 object.getName(),
                 SerializationUtils.serialize(object));
         objectRepository.writeObject(namespace, obj, object.assumeUnique());
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java
index d47597ae..154a2dbf 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java
@@ -4,7 +4,6 @@ import com.usatiuk.dhfs.objects.repository.distributed.GetIndexRequest;
 import com.usatiuk.dhfs.objects.repository.distributed.GetObjectRequest;
 import com.usatiuk.dhfs.objects.repository.distributed.IndexUpdatePush;
 import com.usatiuk.dhfs.objects.repository.distributed.ObjectHeader;
-import com.usatiuk.dhfs.storage.objects.data.Namespace;
 import com.usatiuk.dhfs.storage.objects.data.Object;
 import io.quarkus.logging.Log;
 import io.smallrye.mutiny.Uni;
@@ -40,7 +39,7 @@ public class RemoteObjectServiceClient {
                 }
             }
             return Uni.createFrom().item(new Object(
-                    new Namespace(reply.getObject().getHeader().getNamespace()),
+                    reply.getObject().getHeader().getNamespace(),
                     reply.getObject().getHeader().getName(),
                     reply.getObject().getContent().toByteArray()
             ));
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceServer.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceServer.java
index 61e3c3b3..d8c31266 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceServer.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceServer.java
@@ -41,7 +41,7 @@ public class RemoteObjectServiceServer implements DhfsObjectSyncGrpc {
         });
         if (read.isEmpty()) throw new StatusRuntimeException(Status.NOT_FOUND);
         var obj = read.get().getRight();
-        var header = ObjectHeader.newBuilder().setName(obj.getName()).setNamespace(obj.getNamespace().getName()).setMtime(read.get().getLeft()).setAssumeUnique(meta.getAssumeUnique()).build();
+        var header = ObjectHeader.newBuilder().setName(obj.getName()).setNamespace(obj.getNamespace()).setMtime(read.get().getLeft()).setAssumeUnique(meta.getAssumeUnique()).build();
         var replyObj = ApiObject.newBuilder().setHeader(header).setContent(ByteString.copyFrom(obj.getData())).build();
         return Uni.createFrom().item(GetObjectReply.newBuilder().setObject(replyObj).build());
     }
@@ -61,7 +61,7 @@ public class RemoteObjectServiceServer implements DhfsObjectSyncGrpc {
     @Override
     @Blocking
     public Uni<IndexUpdateReply> indexUpdate(IndexUpdatePush request) {
-        Log.info("<-- indexUpdate: " + request.getName() + " from: " + String.valueOf(request.getPrevMtime()) + " to: " + String.valueOf(request.getMtime()));
+        Log.info("<-- indexUpdate: " + request.getName() + " from: " + request.getPrevMtime() + " to: " + request.getMtime());
         return syncHandler.handleRemoteUpdate(request);
     }
 }
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/persistence/FileObjectPersistentStore.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/persistence/FileObjectPersistentStore.java
index 60a3fcee..d292f2ca 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/persistence/FileObjectPersistentStore.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/persistence/FileObjectPersistentStore.java
@@ -1,6 +1,5 @@
 package com.usatiuk.dhfs.storage.objects.repository.persistence;
 
-import com.usatiuk.dhfs.storage.objects.data.Namespace;
 import com.usatiuk.dhfs.storage.objects.data.Object;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
@@ -71,7 +70,7 @@ public class FileObjectPersistentStore implements ObjectPersistentStore {
         if (!file.toFile().exists())
             throw new StatusRuntimeException(Status.NOT_FOUND);
 
-        return vertx.fileSystem().readFile(file.toString()).map(r -> new Object(new Namespace(namespace), name, r.getBytes()));
+        return vertx.fileSystem().readFile(file.toString()).map(r -> new Object(namespace, name, r.getBytes()));
     }
 
     @Nonnull