diff --git a/Frame/SDK/Core/AFGUID128.hpp b/Frame/SDK/Core/AFGUID128.hpp
index 13725642..2ceda121 100644
--- a/Frame/SDK/Core/AFGUID128.hpp
+++ b/Frame/SDK/Core/AFGUID128.hpp
@@ -1,8 +1,8 @@
 /*
-* This source file is part of ArkGameFrame
-* For the latest info, see https://github.com/ArkGame
+* This source file is part of Ark
+* For the latest info, see https://github.com/QuadHex
 *
-* Copyright (c) 2013-2018 ArkGame authors.
+* Copyright (c) 2013-2018 QuadHex authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,19 +25,19 @@
 namespace ark
 {
 
-    class AFGUID
+    class AFGUID128
     {
     public:
         uint64_t nHigh;
         uint64_t nLow;
 
-        AFGUID() = default;
+        AFGUID128() = default;
 
-        AFGUID(uint64_t value) : nHigh(0), nLow(value)
+        AFGUID128(uint64_t value) : nHigh(0), nLow(value)
         {
         }
 
-        AFGUID(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
+        AFGUID128(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
         {
         }
 
@@ -51,41 +51,41 @@ namespace ark
             return (0 == nHigh) && (0 == nLow);
         }
 
-        AFGUID& operator=(const int& rhs)
+        AFGUID128& operator=(const int& rhs)
         {
             nHigh = 0;
             nLow = rhs;
             return *this;
         }
 
-        AFGUID& operator=(const int64_t& rhs)
+        AFGUID128& operator=(const int64_t& rhs)
         {
             nHigh = 0;
             nLow = rhs;
             return *this;
         }
 
-        AFGUID& operator=(const AFGUID& rhs)
+        AFGUID128& operator=(const AFGUID128& rhs)
         {
 			if(this != &rhs)
 			{
-				this->nHigh = rhs.nHigh;
-				this->nLow = rhs.nLow;
+				nHigh = rhs.nHigh;
+				nLow = rhs.nLow;
 			}
             return *this;
         }
 
-        bool operator==(const AFGUID& rhs) const
+        bool operator==(const AFGUID128& rhs) const
         {
             return (this->nHigh == rhs.nHigh) && (this->nLow == rhs.nLow);
         }
 
-        bool operator!=(const AFGUID& rhs) const
+        bool operator!=(const AFGUID128& rhs) const
         {
             return !(*this == rhs);
         }
 
-        bool operator<(const AFGUID& rhs) const
+        bool operator<(const AFGUID128& rhs) const
         {
             if (this->nHigh == rhs.nHigh)
             {
diff --git a/Frame/SDK/Core/AFVector3.hpp b/Frame/SDK/Core/AFVector3.hpp
index 52b8a1d2..8ad62f79 100644
--- a/Frame/SDK/Core/AFVector3.hpp
+++ b/Frame/SDK/Core/AFVector3.hpp
@@ -1,8 +1,8 @@
 /*
-* This source file is part of ArkGameFrame
-* For the latest info, see https://github.com/ArkGame
+* This source file is part of ARK
+* For the latest info, see https://github.com/QuadHex
 *
-* Copyright (c) 2013-2018 ArkGame authors.
+* Copyright (c) 2013-2018 QuadHex authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -64,9 +64,9 @@ namespace ark
         {
 			if(this != &rht)
 			{
-				this->x = rht.x;
-				this->y = rht.y;
-				this->z = rht.z;
+				x = rht.x;
+				y = rht.y;
+				z = rht.z;
 			}
             return *this;
         }