diff --git a/src/core/entity.cpp b/src/core/entity.cpp
index ac48025..1368155 100644
--- a/src/core/entity.cpp
+++ b/src/core/entity.cpp
@@ -13,8 +13,8 @@ void Entity::createUuid()
     uuid = generator();
 }
 
-void Entity::createUuidFromString(const std::string& uuid_string)
+void Entity::createUuidFromString(const std::string& uuidString)
 {
     boost::uuids::string_generator generator{};
-    uuid = generator(uuid_string);
+    uuid = generator(uuidString);
 }
\ No newline at end of file
diff --git a/src/core/entity.h b/src/core/entity.h
index b36d9a3..63f6229 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -10,9 +10,9 @@ class Entity
   public:
     Entity();
     virtual ~Entity() = 0;
-    const boost::uuids::uuid& getUuid() { return uuid; };
+    const boost::uuids::uuid& getUuid() const { return uuid; };
     void createUuid();
-    void createUuidFromString(const std::string& uuid_string);
+    void createUuidFromString(const std::string& uuidString);
 
   private:
     boost::uuids::uuid uuid{};