diff --git a/src_cpp/py_connection.cpp b/src_cpp/py_connection.cpp
index 6488abd..a665e1d 100644
--- a/src_cpp/py_connection.cpp
+++ b/src_cpp/py_connection.cpp
@@ -352,7 +352,7 @@ static LogicalType pyLogicalType(const py::handle& val) {
     auto datetime_datetime = importCache->datetime.datetime();
     auto time_delta = importCache->datetime.timedelta();
     auto datetime_date = importCache->datetime.date();
-    auto uuid = importCache->uuid.UUID();
+    auto uuid_uuid = importCache->uuid.UUID();
     auto Decimal = importCache->decimal.Decimal();
     if (val.is_none()) {
         return LogicalType::ANY();
@@ -410,7 +410,7 @@ static LogicalType pyLogicalType(const py::handle& val) {
         return LogicalType::DATE();
     } else if (py::isinstance(val, time_delta)) {
         return LogicalType::INTERVAL();
-    } else if (py::isinstance(val, uuid)) {
+    } else if (py::isinstance(val, uuid_uuid)) {
         return LogicalType::UUID();
     } else if (py::isinstance<py::dict>(val)) {
         py::dict dict = py::reinterpret_borrow<py::dict>(val);
@@ -673,8 +673,7 @@ Value PyConnection::transformPythonValueAs(const py::handle& val, const LogicalT
     }
     case LogicalTypeID::UUID: {
         auto strVal = py::str(val).cast<std::string>();
-        auto uuidVal = UUID::fromString(strVal);
-        uuid uuidToAppend{uuidVal};
+        auto uuidToAppend = uuid::fromString(strVal);
         return Value{uuidToAppend};
     }
     case LogicalTypeID::LIST: {
diff --git a/src_cpp/py_conversion.cpp b/src_cpp/py_conversion.cpp
index 9afddc7..6ab7266 100644
--- a/src_cpp/py_conversion.cpp
+++ b/src_cpp/py_conversion.cpp
@@ -18,7 +18,7 @@ PythonObjectType getPythonObjectType(py::handle& ele) {
     auto pyDateTime = importCache->datetime.datetime();
     auto pandasNat = importCache->pandas.NaT();
     auto pyDate = importCache->datetime.date();
-    auto uuid = importCache->uuid.UUID();
+    auto pyUuid = importCache->uuid.UUID();
     if (ele.is_none() || ele.is(pandasNa) || ele.is(pandasNat)) {
         return PythonObjectType::None;
     } else if (py::isinstance<py::bool_>(ele)) {
@@ -37,7 +37,7 @@ PythonObjectType getPythonObjectType(py::handle& ele) {
         return PythonObjectType::Bytes;
     } else if (py::isinstance<py::list>(ele)) {
         return PythonObjectType::List;
-    } else if (py::isinstance(ele, uuid)) {
+    } else if (py::isinstance(ele, pyUuid)) {
         return PythonObjectType::UUID;
     } else if (py::isinstance<py::dict>(ele)) {
         return PythonObjectType::Dict;
@@ -189,9 +189,8 @@ void transformPythonValue(common::ValueVector* outputVector, uint64_t pos, py::h
     } break;
     case PythonObjectType::UUID: {
         outputVector->setNull(pos, false /* isNull */);
-        int128_t result = 0;
-        UUID::fromString(ele.attr("hex").cast<std::string>(), result);
-        outputVector->setValue(pos, result);
+        uuid result = uuid::fromString(ele.attr("hex").cast<std::string>());
+        outputVector->setValue(pos, result.value);
     } break;
     case PythonObjectType::Dict: {
         PyDictionary dict = PyDictionary(py::reinterpret_borrow<py::object>(ele));
diff --git a/src_cpp/py_query_result.cpp b/src_cpp/py_query_result.cpp
index b3e0db8..37c01ce 100644
--- a/src_cpp/py_query_result.cpp
+++ b/src_cpp/py_query_result.cpp
@@ -159,7 +159,7 @@ py::object PyQueryResult::convertValueToPyObject(const Value& value) {
     }
     case LogicalTypeID::UUID: {
         lbug::common::int128_t result = value.getValue<lbug::common::int128_t>();
-        std::string uuidString = lbug::common::UUID::toString(result);
+        std::string uuidString = lbug::common::uuid::toString(result);
         auto UUID = importCache->uuid.UUID();
         return UUID(uuidString);
     }