diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65b8346..2e20344 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,12 +3,12 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-project(kraken-math)
+project(hydra)
 
 set(PUBLIC_HEADERS
   include/aabb.h
   include/hitinfo.h
-  include/kraken-math.h
+  include/hydra.h
   include/matrix2.h
   include/matrix2x3.h
   include/matrix4.h
@@ -37,4 +37,4 @@ set(SRCS
   src/vector2i.cpp
 )
 
-add_library(krakenmath STATIC ${SRCS} ${PUBLIC_HEADERS})
+add_library(hydra STATIC ${SRCS} ${PUBLIC_HEADERS})
diff --git a/include/aabb.h b/include/aabb.h
index 8b4f6cb..a299d98 100644
--- a/include/aabb.h
+++ b/include/aabb.h
@@ -1,6 +1,6 @@
 //
 //  KRAABB.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/hitinfo.h b/include/hitinfo.h
index 896355b..0738485 100644
--- a/include/hitinfo.h
+++ b/include/hitinfo.h
@@ -1,6 +1,6 @@
 //
 //  hitinfo.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/kraken-math.h b/include/hydra.h
similarity index 94%
rename from include/kraken-math.h
rename to include/hydra.h
index d3d93c5..17e52cc 100644
--- a/include/kraken-math.h
+++ b/include/hydra.h
@@ -1,5 +1,6 @@
 //
-//  Kraken
+//  hydra.h
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -28,8 +29,8 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#ifndef KRAKEN_H
-#define KRAKEN_H
+#ifndef KRAKEN_HYDRA_H
+#define KRAKEN_HYDRA_H
 
 #include "scalar.h"
 #include "vector2.h"
@@ -44,4 +45,4 @@
 #include "triangle3.h"
 #include "hitinfo.h"
 
-#endif // KRAKEN_H
+#endif // KRAKEN_HYDRA_H
diff --git a/include/matrix2.h b/include/matrix2.h
index 07eecd5..c0718f1 100644
--- a/include/matrix2.h
+++ b/include/matrix2.h
@@ -1,6 +1,6 @@
 //
 //  Matrix2.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/matrix2x3.h b/include/matrix2x3.h
index 516c06e..74d8043 100644
--- a/include/matrix2x3.h
+++ b/include/matrix2x3.h
@@ -1,6 +1,6 @@
 //
 //  Matrix2x3.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/matrix4.h b/include/matrix4.h
index 5c787f8..374c0ea 100644
--- a/include/matrix4.h
+++ b/include/matrix4.h
@@ -1,6 +1,6 @@
 //
 //  Matrix4.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/quaternion.h b/include/quaternion.h
index dc12380..d950232 100644
--- a/include/quaternion.h
+++ b/include/quaternion.h
@@ -1,6 +1,6 @@
 //
 //  Quaternion.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/scalar.h b/include/scalar.h
index dc74a55..9cbd483 100644
--- a/include/scalar.h
+++ b/include/scalar.h
@@ -1,6 +1,6 @@
 //
 //  KRFloat.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/triangle3.h b/include/triangle3.h
index 3db2d2d..7335167 100644
--- a/include/triangle3.h
+++ b/include/triangle3.h
@@ -1,6 +1,6 @@
 //
 //  KRTriangle.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/vector2.h b/include/vector2.h
index ce2be47..3898e10 100644
--- a/include/vector2.h
+++ b/include/vector2.h
@@ -1,6 +1,6 @@
 //
 //  vector2.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/vector2i.h b/include/vector2i.h
index caaf00d..2839bbe 100644
--- a/include/vector2i.h
+++ b/include/vector2i.h
@@ -1,6 +1,6 @@
 //
 //  vector2i.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/vector3.h b/include/vector3.h
index 27d0797..5613758 100644
--- a/include/vector3.h
+++ b/include/vector3.h
@@ -1,6 +1,6 @@
 //
 //  Vector3.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/include/vector4.h b/include/vector4.h
index acf820f..bdf4349 100644
--- a/include/vector4.h
+++ b/include/vector4.h
@@ -1,6 +1,6 @@
 //
 //  Vector4.h
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/src/aabb.cpp b/src/aabb.cpp
index 1c9a5a7..2e769f4 100644
--- a/src/aabb.cpp
+++ b/src/aabb.cpp
@@ -1,6 +1,6 @@
 //
 //  aabb.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 #include "assert.h"
 #include "krhelpers.h"
 
diff --git a/src/hitinfo.cpp b/src/hitinfo.cpp
index 690cc6a..d754cba 100644
--- a/src/hitinfo.cpp
+++ b/src/hitinfo.cpp
@@ -1,6 +1,6 @@
 //
 //  hitinfo.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 namespace kraken {
 
diff --git a/src/krhelpers.cpp b/src/krhelpers.cpp
index 6387830..3fbf57b 100644
--- a/src/krhelpers.cpp
+++ b/src/krhelpers.cpp
@@ -1,6 +1,6 @@
 //
 //  krhelpers.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
diff --git a/src/krhelpers.h b/src/krhelpers.h
index bbc9a14..c278133 100644
--- a/src/krhelpers.h
+++ b/src/krhelpers.h
@@ -16,7 +16,7 @@
 
 #endif // defined(KRAKEN_USE_OPENGL)
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 #define KRMIN(x,y) ((x) < (y) ? (x) : (y))
 #define KRMAX(x,y) ((x) > (y) ? (x) : (y))
diff --git a/src/matrix2.cpp b/src/matrix2.cpp
index 80b1e2b..f6a8085 100644
--- a/src/matrix2.cpp
+++ b/src/matrix2.cpp
@@ -1,6 +1,6 @@
 //
 //  matrix2.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 #include <string.h>
 
diff --git a/src/matrix2x3.cpp b/src/matrix2x3.cpp
index 3e5bee5..5a2dbd7 100644
--- a/src/matrix2x3.cpp
+++ b/src/matrix2x3.cpp
@@ -1,6 +1,6 @@
 //
 //  matrix23.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 #include <string.h>
 
diff --git a/src/matrix4.cpp b/src/matrix4.cpp
index eec7cea..eb552ff 100644
--- a/src/matrix4.cpp
+++ b/src/matrix4.cpp
@@ -1,6 +1,6 @@
 //
 //  matrix4.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 #include <string.h>
 
diff --git a/src/quaternion.cpp b/src/quaternion.cpp
index b5c1231..f3c5d74 100644
--- a/src/quaternion.cpp
+++ b/src/quaternion.cpp
@@ -1,6 +1,6 @@
 //
 //  quaternion.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 #include "krhelpers.h"
 
diff --git a/src/scalar.cpp b/src/scalar.cpp
index aadf574..3fee6d1 100644
--- a/src/scalar.cpp
+++ b/src/scalar.cpp
@@ -1,6 +1,6 @@
 //
 //  scalar.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 namespace kraken {
 
diff --git a/src/triangle3.cpp b/src/triangle3.cpp
index c91645e..54ec129 100644
--- a/src/triangle3.cpp
+++ b/src/triangle3.cpp
@@ -1,6 +1,6 @@
 //
 //  KRTriangle.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 
 using namespace kraken;
 
diff --git a/src/vector2.cpp b/src/vector2.cpp
index ac5f7ef..3ef5e56 100644
--- a/src/vector2.cpp
+++ b/src/vector2.cpp
@@ -1,6 +1,6 @@
 //
 //  Vector2.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 #include "krhelpers.h"
 
 namespace kraken {
diff --git a/src/vector2i.cpp b/src/vector2i.cpp
index 23da6a5..e5dc12a 100644
--- a/src/vector2i.cpp
+++ b/src/vector2i.cpp
@@ -1,265 +1,265 @@
-//
-//  Vector2i.cpp
-//  Kraken
-//
-//  Copyright 2018 Kearwood Gilbert. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, are
-//  permitted provided that the following conditions are met:
-//
-//  1. Redistributions of source code must retain the above copyright notice, this list of
-//  conditions and the following disclaimer.
-//
-//  2. Redistributions in binary form must reproduce the above copyright notice, this list
-//  of conditions and the following disclaimer in the documentation and/or other materials
-//  provided with the distribution.
-//
-//  THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED
-//  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-//  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR
-//  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-//  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-//  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//  The views and conclusions contained in the software and documentation are those of the
-//  authors and should not be interpreted as representing official policies, either expressed
-//  or implied, of Kearwood Gilbert.
-//
-
-#include "../include/kraken-math.h"
-#include "krhelpers.h"
-
-namespace kraken {
-
-void Vector2i::init() {
-    x = 0;
-    y = 0;
-}
-
-Vector2i Vector2i::Create()
-{
-    Vector2i r;
-    r.init();
-    return r;
-}
-
-void Vector2i::init(int X, int Y) {
-    x = X;
-    y = Y;
-}
-
-Vector2i Vector2i::Create(int X, int Y)
-{
-    Vector2i r;
-    r.init(X,Y);
-    return r;
-}
-
-void Vector2i::init(int v) {
-    x = v;
-    y = v;
-}
-
-Vector2i Vector2i::Create(int v)
-{
-    Vector2i r;
-    r.init(v);
-    return r;
-}
-
-void Vector2i::init(int *v) {
-    x = v[0];
-    y = v[1];
-}
-
-Vector2i Vector2i::Create(int *v)
-{
-    Vector2i r;
-    r.init(v);
-    return r;
-}
-
-void Vector2i::init(const Vector2i &v) {
-    x = v.x;
-    y = v.y;
-}
-
-Vector2i Vector2i::Create(const Vector2i &v)
-{
-    Vector2i r;
-    r.init(v);
-    return r;
-}
-
-// Vector2 swizzle getters
-Vector2i Vector2i::yx() const
-{
-    return Vector2i::Create(y,x);
-}
-
-// Vector2 swizzle setters
-void Vector2i::yx(const Vector2i &v)
-{
-    y = v.x;
-    x = v.y;
-}
-
-Vector2i Vector2i::Min() {
-    return Vector2i::Create(-std::numeric_limits<int>::max());
-}
-
-Vector2i Vector2i::Max() {
-    return Vector2i::Create(std::numeric_limits<int>::max());
-}
-
-Vector2i Vector2i::Zero() {
-    return Vector2i::Create(0);
-}
-
-Vector2i Vector2i::One() {
-    return Vector2i::Create(1);
-}
-
-Vector2i Vector2i::operator +(const Vector2i& b) const {
-    return Vector2i::Create(x + b.x, y + b.y);
-}
-
-Vector2i Vector2i::operator -(const Vector2i& b) const {
-    return Vector2i::Create(x - b.x, y - b.y);
-}
-
-Vector2i Vector2i::operator +() const {
-    return *this;
-}
-
-Vector2i Vector2i::operator -() const {
-    return Vector2i::Create(-x, -y);
-}
-
-Vector2i Vector2i::operator *(const int v) const {
-    return Vector2i::Create(x * v, y * v);
-}
-
-Vector2i Vector2i::operator /(const int v) const {
-    return Vector2i::Create(x / v, y / v);
-}
-
-Vector2i& Vector2i::operator +=(const Vector2i& b) {
-    x += b.x;
-    y += b.y;
-    return *this;
-}
-
-Vector2i& Vector2i::operator -=(const Vector2i& b) {
-    x -= b.x;
-    y -= b.y;
-    return *this;
-}
-
-Vector2i& Vector2i::operator *=(const int v) {
-    x *= v;
-    y *= v;
-    return *this;
-}
-
-Vector2i& Vector2i::operator /=(const int v) {
-    x /= v;
-    y /= v;
-    return *this;
-}
-
-bool Vector2i::operator ==(const Vector2i& b) const {
-    return x == b.x && y == b.y;
-}
-
-bool Vector2i::operator !=(const Vector2i& b) const {
-    return x != b.x || y != b.y;
-}
-
-bool Vector2i::operator >(const Vector2i& b) const
-{
-    // Comparison operators are implemented to allow insertion into sorted containers such as std::set
-    if(x > b.x) {
-        return true;
-    } else if(x < b.x) {
-        return false;
-    } else if(y > b.y) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool Vector2i::operator <(const Vector2i& b) const
-{
-    // Comparison operators are implemented to allow insertion into sorted containers such as std::set
-    if(x < b.x) {
-        return true;
-    } else if(x > b.x) {
-        return false;
-    } else if(y < b.y) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-int& Vector2i::operator[] (unsigned i) {
-    switch(i) {
-        case 0:
-            return x;
-        case 1:
-        default:
-            return y;
-    }
-}
-
-int Vector2i::operator[](unsigned i) const {
-    switch(i) {
-        case 0:
-            return x;
-        case 1:
-        default:
-            return y;
-    }
-}
-
-void Vector2i::normalize() {
-    int m = magnitude();
-    x /= m;
-    y /= m;
-}
-
-int Vector2i::sqrMagnitude() const {
-    return x * x + y * y;
-}
-
-int Vector2i::magnitude() const {
-    return static_cast<int>(sqrt(x * x + y * y));
-}
-
-Vector2i Vector2i::Normalize(const Vector2i &v) {
-    int m = v.magnitude();
-    return Vector2i::Create(v.x / m, v.y / m);
-}
-
-int Vector2i::Cross(const Vector2i &v1, const Vector2i &v2) {
-    return v1.x * v2.y - v1.y * v2.x;
-}
-
-int Vector2i::Dot(const Vector2i &v1, const Vector2i &v2) {
-    return v1.x * v2.x + v1.y * v2.y;
-}
-
+//
+//  Vector2i.cpp
+//  Kraken Engine / Hydra
+//
+//  Copyright 2018 Kearwood Gilbert. All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification, are
+//  permitted provided that the following conditions are met:
+//
+//  1. Redistributions of source code must retain the above copyright notice, this list of
+//  conditions and the following disclaimer.
+//
+//  2. Redistributions in binary form must reproduce the above copyright notice, this list
+//  of conditions and the following disclaimer in the documentation and/or other materials
+//  provided with the distribution.
+//
+//  THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED
+//  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+//  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR
+//  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+//  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+//  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//  The views and conclusions contained in the software and documentation are those of the
+//  authors and should not be interpreted as representing official policies, either expressed
+//  or implied, of Kearwood Gilbert.
+//
+
+#include "../include/hydra.h"
+#include "krhelpers.h"
+
+namespace kraken {
+
+void Vector2i::init() {
+    x = 0;
+    y = 0;
+}
+
+Vector2i Vector2i::Create()
+{
+    Vector2i r;
+    r.init();
+    return r;
+}
+
+void Vector2i::init(int X, int Y) {
+    x = X;
+    y = Y;
+}
+
+Vector2i Vector2i::Create(int X, int Y)
+{
+    Vector2i r;
+    r.init(X,Y);
+    return r;
+}
+
+void Vector2i::init(int v) {
+    x = v;
+    y = v;
+}
+
+Vector2i Vector2i::Create(int v)
+{
+    Vector2i r;
+    r.init(v);
+    return r;
+}
+
+void Vector2i::init(int *v) {
+    x = v[0];
+    y = v[1];
+}
+
+Vector2i Vector2i::Create(int *v)
+{
+    Vector2i r;
+    r.init(v);
+    return r;
+}
+
+void Vector2i::init(const Vector2i &v) {
+    x = v.x;
+    y = v.y;
+}
+
+Vector2i Vector2i::Create(const Vector2i &v)
+{
+    Vector2i r;
+    r.init(v);
+    return r;
+}
+
+// Vector2 swizzle getters
+Vector2i Vector2i::yx() const
+{
+    return Vector2i::Create(y,x);
+}
+
+// Vector2 swizzle setters
+void Vector2i::yx(const Vector2i &v)
+{
+    y = v.x;
+    x = v.y;
+}
+
+Vector2i Vector2i::Min() {
+    return Vector2i::Create(-std::numeric_limits<int>::max());
+}
+
+Vector2i Vector2i::Max() {
+    return Vector2i::Create(std::numeric_limits<int>::max());
+}
+
+Vector2i Vector2i::Zero() {
+    return Vector2i::Create(0);
+}
+
+Vector2i Vector2i::One() {
+    return Vector2i::Create(1);
+}
+
+Vector2i Vector2i::operator +(const Vector2i& b) const {
+    return Vector2i::Create(x + b.x, y + b.y);
+}
+
+Vector2i Vector2i::operator -(const Vector2i& b) const {
+    return Vector2i::Create(x - b.x, y - b.y);
+}
+
+Vector2i Vector2i::operator +() const {
+    return *this;
+}
+
+Vector2i Vector2i::operator -() const {
+    return Vector2i::Create(-x, -y);
+}
+
+Vector2i Vector2i::operator *(const int v) const {
+    return Vector2i::Create(x * v, y * v);
+}
+
+Vector2i Vector2i::operator /(const int v) const {
+    return Vector2i::Create(x / v, y / v);
+}
+
+Vector2i& Vector2i::operator +=(const Vector2i& b) {
+    x += b.x;
+    y += b.y;
+    return *this;
+}
+
+Vector2i& Vector2i::operator -=(const Vector2i& b) {
+    x -= b.x;
+    y -= b.y;
+    return *this;
+}
+
+Vector2i& Vector2i::operator *=(const int v) {
+    x *= v;
+    y *= v;
+    return *this;
+}
+
+Vector2i& Vector2i::operator /=(const int v) {
+    x /= v;
+    y /= v;
+    return *this;
+}
+
+bool Vector2i::operator ==(const Vector2i& b) const {
+    return x == b.x && y == b.y;
+}
+
+bool Vector2i::operator !=(const Vector2i& b) const {
+    return x != b.x || y != b.y;
+}
+
+bool Vector2i::operator >(const Vector2i& b) const
+{
+    // Comparison operators are implemented to allow insertion into sorted containers such as std::set
+    if(x > b.x) {
+        return true;
+    } else if(x < b.x) {
+        return false;
+    } else if(y > b.y) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool Vector2i::operator <(const Vector2i& b) const
+{
+    // Comparison operators are implemented to allow insertion into sorted containers such as std::set
+    if(x < b.x) {
+        return true;
+    } else if(x > b.x) {
+        return false;
+    } else if(y < b.y) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+int& Vector2i::operator[] (unsigned i) {
+    switch(i) {
+        case 0:
+            return x;
+        case 1:
+        default:
+            return y;
+    }
+}
+
+int Vector2i::operator[](unsigned i) const {
+    switch(i) {
+        case 0:
+            return x;
+        case 1:
+        default:
+            return y;
+    }
+}
+
+void Vector2i::normalize() {
+    int m = magnitude();
+    x /= m;
+    y /= m;
+}
+
+int Vector2i::sqrMagnitude() const {
+    return x * x + y * y;
+}
+
+int Vector2i::magnitude() const {
+    return static_cast<int>(sqrt(x * x + y * y));
+}
+
+Vector2i Vector2i::Normalize(const Vector2i &v) {
+    int m = v.magnitude();
+    return Vector2i::Create(v.x / m, v.y / m);
+}
+
+int Vector2i::Cross(const Vector2i &v1, const Vector2i &v2) {
+    return v1.x * v2.y - v1.y * v2.x;
+}
+
+int Vector2i::Dot(const Vector2i &v1, const Vector2i &v2) {
+    return v1.x * v2.x + v1.y * v2.y;
+}
+
 Vector2i Vector2i::Min(const Vector2i &v1, const Vector2i &v2) {
   return Vector2i::Create(KRMIN(v1.x, v2.x), KRMIN(v1.y, v2.y));
 }
 
-Vector2i Vector2i::Max(const Vector2i &v1, const Vector2i &v2) {
-  return Vector2i::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y));
-}
-
-} // namepsace kraken
+Vector2i Vector2i::Max(const Vector2i &v1, const Vector2i &v2) {
+  return Vector2i::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y));
+}
+
+} // namepsace kraken
diff --git a/src/vector3.cpp b/src/vector3.cpp
index 899e730..533730e 100644
--- a/src/vector3.cpp
+++ b/src/vector3.cpp
@@ -1,6 +1,6 @@
 //
 //  Vector3.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 #include "krhelpers.h"
 
 namespace kraken {
diff --git a/src/vector4.cpp b/src/vector4.cpp
index 4aa8514..7b26187 100644
--- a/src/vector4.cpp
+++ b/src/vector4.cpp
@@ -1,6 +1,6 @@
 //
 //  Vector4.cpp
-//  Kraken
+//  Kraken Engine / Hydra
 //
 //  Copyright 2018 Kearwood Gilbert. All rights reserved.
 //
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "../include/kraken-math.h"
+#include "../include/hydra.h"
 #include "krhelpers.h"
 
 namespace kraken {