diff --git a/README.md b/README.md
index 58a58de2..dcffdb97 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 # Laravel MySQL Spatial extension
 
-[![Build Status](https://img.shields.io/travis/grimzy/laravel-mysql-spatial.svg?style=flat-square)](https://travis-ci.org/grimzy/laravel-mysql-spatial)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/grimzy/laravel-mysql-spatial.svg?style=flat-square)](https://codeclimate.com/github/grimzy/laravel-mysql-spatial/maintainability)
-[![Code Climate](https://img.shields.io/codeclimate/c/grimzy/laravel-mysql-spatial.svg?style=flat-square&colorB=4BCA2A)](https://codeclimate.com/github/grimzy/laravel-mysql-spatial/test_coverage) [![Packagist](https://img.shields.io/packagist/v/grimzy/laravel-mysql-spatial.svg?style=flat-square)](https://packagist.org/packages/grimzy/laravel-mysql-spatial)
-[![Packagist](https://img.shields.io/packagist/dt/grimzy/laravel-mysql-spatial.svg?style=flat-square)](https://packagist.org/packages/grimzy/laravel-mysql-spatial) [![StyleCI](https://github.styleci.io/repos/83766141/shield?branch=master)](https://github.styleci.io/repos/83766141) 
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square)](LICENSE)
 
 Laravel package to easily work with [MySQL Spatial Data Types](https://dev.mysql.com/doc/refman/8.0/en/spatial-type-overview.html) and [MySQL Spatial Functions](https://dev.mysql.com/doc/refman/8.0/en/spatial-function-reference.html).
@@ -12,8 +8,7 @@ Please check the documentation for your MySQL version. MySQL's Extension for Spa
 
 **Versions**
 
-- `1.x.x`: MySQL 5.6 (also supports MySQL 5.5 but not all spatial analysis functions)
-- `2.x.x`: MySQL 5.7 and 8.0
+- `2.1.4`: MySQL 5.7 and 8.0
 
 This package also works with MariaDB. Please refer to the [MySQL/MariaDB Spatial Support Matrix](https://mariadb.com/kb/en/library/mysqlmariadb-spatial-support-matrix/) for compatibility.
 
@@ -22,13 +17,7 @@ This package also works with MariaDB. Please refer to the [MySQL/MariaDB Spatial
 Add the package using composer:
 
 ```shell
-composer require grimzy/laravel-mysql-spatial
-```
-
-For MySQL 5.6 and 5.5:
-
-```shell
-composer require grimzy/laravel-mysql-spatial:^1.0
+composer require kndol/laravel-mysql-spatial
 ```
 
 For Laravel versions before 5.5 or if not using auto-discovery, register the service provider in `config/app.php`:
@@ -38,7 +27,7 @@ For Laravel versions before 5.5 or if not using auto-discovery, register the ser
   /*
    * Package Service Providers...
    */
-  Grimzy\LaravelMysqlSpatial\SpatialServiceProvider::class,
+  Kndol\LaravelMysqlSpatial\SpatialServiceProvider::class,
 ],
 ```
 
@@ -52,14 +41,14 @@ From the command line:
 php artisan make:migration create_places_table
 ```
 
-Then edit the migration you just created by adding at least one spatial data field. For Laravel versions prior to 5.5, you can use the Blueprint provided by this package (Grimzy\LaravelMysqlSpatial\Schema\Blueprint):
+Then edit the migration you just created by adding at least one spatial data field. For Laravel versions prior to 5.5, you can use the Blueprint provided by this package (Kndol\LaravelMysqlSpatial\Schema\Blueprint):
 
 ```php
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 // For Laravel < 5.5
-// use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
+// use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
 
 class CreatePlacesTable extends Migration {
 
@@ -114,11 +103,11 @@ Then edit the model you just created. It must use the `SpatialTrait` and define
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 /**
- * @property \Grimzy\LaravelMysqlSpatial\Types\Point   $location
- * @property \Grimzy\LaravelMysqlSpatial\Types\Polygon $area
+ * @property \Kndol\LaravelMysqlSpatial\Types\Point   $location
+ * @property \Kndol\LaravelMysqlSpatial\Types\Polygon $area
  */
 class Place extends Model
 {
@@ -138,8 +127,8 @@ class Place extends Model
 ### Saving a model
 
 ```php
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 
 $place1 = new Place();
 $place1->name = 'Empire State Building';
@@ -174,7 +163,7 @@ $lng = $place2->location->getLng();	// -73.9878441
 
 ### Available Geometry classes
 
-| Grimzy\LaravelMysqlSpatial\Types                             | OpenGIS Class                                                |
+| Kndol\LaravelMysqlSpatial\Types                             | OpenGIS Class                                                |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | `Point($lat, $lng)`                                          | [Point](https://dev.mysql.com/doc/refman/8.0/en/gis-class-point.html) |
 | `MultiPoint(Point[])`                                        | [MultiPoint](https://dev.mysql.com/doc/refman/8.0/en/gis-class-multipoint.html) |
@@ -188,7 +177,7 @@ Check out the [Class diagram](https://user-images.githubusercontent.com/1837678/
 
 ### Using Geometry classes
 
-In order for your Eloquent Model to handle the Geometry classes, it must use the `Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait` trait and define a `protected` property `$spatialFields`  as an array of MySQL Spatial Data Type column names (example in [Quickstart](#user-content-create-a-model)).
+In order for your Eloquent Model to handle the Geometry classes, it must use the `Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait` trait and define a `protected` property `$spatialFields`  as an array of MySQL Spatial Data Type column names (example in [Quickstart](#user-content-create-a-model)).
 
 #### IteratorAggregate and ArrayAccess
 
@@ -265,6 +254,7 @@ Spatial analysis functions are implemented using [Eloquent Local Scopes](https:/
 
 Available scopes:
 
+- `eachDistance($geometryColumn, $distanceColumn, $geometry)`
 - `distance($geometryColumn, $geometry, $distance)`
 - `distanceExcludingSelf($geometryColumn, $geometry, $distance)`
 - `distanceSphere($geometryColumn, $geometry, $distance)`
@@ -279,18 +269,18 @@ Available scopes:
 - `overlaps($geometryColumn, $geometry)`
 - `doesTouch($geometryColumn, $geometry)`
 - `orderBySpatial($geometryColumn, $geometry, $orderFunction, $direction = 'asc')`
-- `orderByDistance($geometryColumn, ​$geometry, ​$direction = 'asc')`
-- `orderByDistanceSphere($geometryColumn, ​$geometry, ​$direction = 'asc')`
+- `orderByDistance($geometryColumn, $geometry, $direction = 'asc')`
+- `orderByDistanceSphere($geometryColumn, $geometry, $direction = 'asc')`
 
 *Note that behavior and availability of MySQL spatial analysis functions differs in each MySQL version (cf. [documentation](https://dev.mysql.com/doc/refman/5.7/en/spatial-function-reference.html)).*
 
 ## Migrations
 
-For Laravel versions prior to 5.5, you can use the Blueprint provided with this package: `Grimzy\LaravelMysqlSpatial\Schema\Blueprint`.
+For Laravel versions prior to 5.5, you can use the Blueprint provided with this package: `Kndol\LaravelMysqlSpatial\Schema\Blueprint`.
 
 ```php
 use Illuminate\Database\Migrations\Migration;
-use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
+use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
 
 class CreatePlacesTable extends Migration {
     // ...
diff --git a/composer.json b/composer.json
index 9a4efa85..d16880be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "grimzy/laravel-mysql-spatial",
+    "name": "kndol/laravel-mysql-spatial",
     "description": "MySQL spatial data types extension for Laravel.",
     "scripts": {
         "test": "phpunit -c phpunit.xml.dist",
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Grimzy\\LaravelMysqlSpatial\\": "src/"
+            "Kndol\\LaravelMysqlSpatial\\": "src/"
         }
     },
     "autoload-dev" : {
@@ -47,7 +47,7 @@
         },
         "laravel": {
             "providers": [
-                "Grimzy\\LaravelMysqlSpatial\\SpatialServiceProvider"
+                "Kndol\\LaravelMysqlSpatial\\SpatialServiceProvider"
             ]
         }
     }
diff --git a/src/Connectors/ConnectionFactory.php b/src/Connectors/ConnectionFactory.php
index 223cea13..bfabb09a 100644
--- a/src/Connectors/ConnectionFactory.php
+++ b/src/Connectors/ConnectionFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Connectors;
+namespace Kndol\LaravelMysqlSpatial\Connectors;
 
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
 use Illuminate\Database\Connectors\ConnectionFactory as IlluminateConnectionFactory;
 use PDO;
 
diff --git a/src/Doctrine/Geometry.php b/src/Doctrine/Geometry.php
index e7e138f9..7ffaeac6 100644
--- a/src/Doctrine/Geometry.php
+++ b/src/Doctrine/Geometry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/GeometryCollection.php b/src/Doctrine/GeometryCollection.php
index 16d106fb..07260ed4 100644
--- a/src/Doctrine/GeometryCollection.php
+++ b/src/Doctrine/GeometryCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/LineString.php b/src/Doctrine/LineString.php
index 9ba31476..c045b4f4 100644
--- a/src/Doctrine/LineString.php
+++ b/src/Doctrine/LineString.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/MultiLineString.php b/src/Doctrine/MultiLineString.php
index ffabd599..df29c7d5 100644
--- a/src/Doctrine/MultiLineString.php
+++ b/src/Doctrine/MultiLineString.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/MultiPoint.php b/src/Doctrine/MultiPoint.php
index 894ce70c..1a1619cb 100644
--- a/src/Doctrine/MultiPoint.php
+++ b/src/Doctrine/MultiPoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/MultiPolygon.php b/src/Doctrine/MultiPolygon.php
index 0d2e6185..fdb9baa3 100644
--- a/src/Doctrine/MultiPolygon.php
+++ b/src/Doctrine/MultiPolygon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/Point.php b/src/Doctrine/Point.php
index 3e8365e9..2f0fe006 100644
--- a/src/Doctrine/Point.php
+++ b/src/Doctrine/Point.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Doctrine/Polygon.php b/src/Doctrine/Polygon.php
index e8c81c09..2fbb6fbe 100644
--- a/src/Doctrine/Polygon.php
+++ b/src/Doctrine/Polygon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Doctrine;
+namespace Kndol\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
diff --git a/src/Eloquent/BaseBuilder.php b/src/Eloquent/BaseBuilder.php
index 33c0f21c..7f98def4 100644
--- a/src/Eloquent/BaseBuilder.php
+++ b/src/Eloquent/BaseBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+namespace Kndol\LaravelMysqlSpatial\Eloquent;
 
 use Illuminate\Database\Query\Builder as QueryBuilder;
 
diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
index 6230ed17..eeea8b51 100755
--- a/src/Eloquent/Builder.php
+++ b/src/Eloquent/Builder.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+namespace Kndol\LaravelMysqlSpatial\Eloquent;
 
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
+use Kndol\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 class Builder extends EloquentBuilder
diff --git a/src/Eloquent/SpatialExpression.php b/src/Eloquent/SpatialExpression.php
index 7bc88178..c651106f 100644
--- a/src/Eloquent/SpatialExpression.php
+++ b/src/Eloquent/SpatialExpression.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+namespace Kndol\LaravelMysqlSpatial\Eloquent;
 
 use Illuminate\Database\Query\Expression;
 
diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
index c1bf101c..6d35c861 100755
--- a/src/Eloquent/SpatialTrait.php
+++ b/src/Eloquent/SpatialTrait.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+namespace Kndol\LaravelMysqlSpatial\Eloquent;
 
-use Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
-use Grimzy\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException;
-use Grimzy\LaravelMysqlSpatial\Exceptions\UnknownSpatialRelationFunction;
-use Grimzy\LaravelMysqlSpatial\Types\Geometry;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
+use Kndol\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
+use Kndol\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException;
+use Kndol\LaravelMysqlSpatial\Exceptions\UnknownSpatialRelationFunction;
+use Kndol\LaravelMysqlSpatial\Types\Geometry;
+use Kndol\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 /**
  * Trait SpatialTrait.
  *
+ * @method static eachDistance($geometryColumn, $distanceColumn, $geometry)
  * @method static distance($geometryColumn, $geometry, $distance)
  * @method static distanceExcludingSelf($geometryColumn, $geometry, $distance)
  * @method static distanceSphere($geometryColumn, $geometry, $distance)
@@ -63,7 +64,7 @@ trait SpatialTrait
      *
      * @param \Illuminate\Database\Query\Builder $query
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Eloquent\Builder
+     * @return \Kndol\LaravelMysqlSpatial\Eloquent\Builder
      */
     public function newEloquentBuilder($query)
     {
@@ -128,11 +129,21 @@ public function isColumnAllowed($geometryColumn)
         return true;
     }
 
+    public function scopeEachDistance($query, $geometryColumn, $distanceColumn, $geometry)
+    {
+        $this->isColumnAllowed($geometryColumn);
+
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?))*100000 <= `$distanceColumn`",
+            $geometry->toWkt());
+
+        return $query;
+    }
+
     public function scopeDistance($query, $geometryColumn, $geometry, $distance)
     {
         $this->isColumnAllowed($geometryColumn);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) <= ?", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?))*100000 <= ?", [
             $geometry->toWkt(),
             $distance,
         ]);
@@ -146,7 +157,7 @@ public function scopeDistanceExcludingSelf($query, $geometryColumn, $geometry, $
 
         $query = $this->scopeDistance($query, $geometryColumn, $geometry, $distance);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) != 0", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?))*100000 != 0", [
             $geometry->toWkt(),
         ]);
 
@@ -163,7 +174,7 @@ public function scopeDistanceValue($query, $geometryColumn, $geometry)
             $query->select('*');
         }
 
-        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) as distance", [
+        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)*100000) as distance", [
             $geometry->toWkt(),
         ]);
     }
diff --git a/src/Exceptions/InvalidGeoJsonException.php b/src/Exceptions/InvalidGeoJsonException.php
index 3374fdb7..e92a480c 100644
--- a/src/Exceptions/InvalidGeoJsonException.php
+++ b/src/Exceptions/InvalidGeoJsonException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Exceptions;
+namespace Kndol\LaravelMysqlSpatial\Exceptions;
 
 class InvalidGeoJsonException extends \RuntimeException
 {
diff --git a/src/Exceptions/SpatialFieldsNotDefinedException.php b/src/Exceptions/SpatialFieldsNotDefinedException.php
index a81d42b6..150621bb 100755
--- a/src/Exceptions/SpatialFieldsNotDefinedException.php
+++ b/src/Exceptions/SpatialFieldsNotDefinedException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Exceptions;
+namespace Kndol\LaravelMysqlSpatial\Exceptions;
 
 class SpatialFieldsNotDefinedException extends \RuntimeException
 {
diff --git a/src/Exceptions/UnknownSpatialFunctionException.php b/src/Exceptions/UnknownSpatialFunctionException.php
index 19f5b6e9..b8cd3269 100644
--- a/src/Exceptions/UnknownSpatialFunctionException.php
+++ b/src/Exceptions/UnknownSpatialFunctionException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Exceptions;
+namespace Kndol\LaravelMysqlSpatial\Exceptions;
 
 class UnknownSpatialFunctionException extends \RuntimeException
 {
diff --git a/src/Exceptions/UnknownSpatialRelationFunction.php b/src/Exceptions/UnknownSpatialRelationFunction.php
index 58733348..afdd003c 100644
--- a/src/Exceptions/UnknownSpatialRelationFunction.php
+++ b/src/Exceptions/UnknownSpatialRelationFunction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Exceptions;
+namespace Kndol\LaravelMysqlSpatial\Exceptions;
 
 class UnknownSpatialRelationFunction extends \RuntimeException
 {
diff --git a/src/Exceptions/UnknownWKTTypeException.php b/src/Exceptions/UnknownWKTTypeException.php
index 5c90d321..232e02b0 100755
--- a/src/Exceptions/UnknownWKTTypeException.php
+++ b/src/Exceptions/UnknownWKTTypeException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Exceptions;
+namespace Kndol\LaravelMysqlSpatial\Exceptions;
 
 class UnknownWKTTypeException extends \RuntimeException
 {
diff --git a/src/MysqlConnection.php b/src/MysqlConnection.php
index 38a2b1a4..c033a717 100644
--- a/src/MysqlConnection.php
+++ b/src/MysqlConnection.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial;
+namespace Kndol\LaravelMysqlSpatial;
 
 use Doctrine\DBAL\Types\Type as DoctrineType;
-use Grimzy\LaravelMysqlSpatial\Schema\Builder;
-use Grimzy\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
+use Kndol\LaravelMysqlSpatial\Schema\Builder;
+use Kndol\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
 use Illuminate\Database\MySqlConnection as IlluminateMySqlConnection;
 
 class MysqlConnection extends IlluminateMySqlConnection
diff --git a/src/Schema/Blueprint.php b/src/Schema/Blueprint.php
index 9507e31e..6c56648d 100644
--- a/src/Schema/Blueprint.php
+++ b/src/Schema/Blueprint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Schema;
+namespace Kndol\LaravelMysqlSpatial\Schema;
 
 use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
 
diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
index baf8dc58..a0b73126 100644
--- a/src/Schema/Builder.php
+++ b/src/Schema/Builder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Schema;
+namespace Kndol\LaravelMysqlSpatial\Schema;
 
 use Closure;
 use Illuminate\Database\Schema\MySqlBuilder;
diff --git a/src/Schema/Grammars/MySqlGrammar.php b/src/Schema/Grammars/MySqlGrammar.php
index 61f015d1..f4c95298 100644
--- a/src/Schema/Grammars/MySqlGrammar.php
+++ b/src/Schema/Grammars/MySqlGrammar.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Schema\Grammars;
+namespace Kndol\LaravelMysqlSpatial\Schema\Grammars;
 
-use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
+use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
 use Illuminate\Database\Schema\Grammars\MySqlGrammar as IlluminateMySqlGrammar;
 use Illuminate\Support\Fluent;
 
@@ -107,7 +107,7 @@ public function typeGeometrycollection(Fluent $column)
     /**
      * Compile a spatial index key command.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Schema\Blueprint $blueprint
+     * @param \Kndol\LaravelMysqlSpatial\Schema\Blueprint $blueprint
      * @param \Illuminate\Support\Fluent                   $command
      *
      * @return string
diff --git a/src/SpatialServiceProvider.php b/src/SpatialServiceProvider.php
index 3b859f8e..4714559b 100644
--- a/src/SpatialServiceProvider.php
+++ b/src/SpatialServiceProvider.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial;
+namespace Kndol\LaravelMysqlSpatial;
 
 use Doctrine\DBAL\Types\Type as DoctrineType;
-use Grimzy\LaravelMysqlSpatial\Connectors\ConnectionFactory;
-use Grimzy\LaravelMysqlSpatial\Doctrine\Geometry;
-use Grimzy\LaravelMysqlSpatial\Doctrine\GeometryCollection;
-use Grimzy\LaravelMysqlSpatial\Doctrine\LineString;
-use Grimzy\LaravelMysqlSpatial\Doctrine\MultiLineString;
-use Grimzy\LaravelMysqlSpatial\Doctrine\MultiPoint;
-use Grimzy\LaravelMysqlSpatial\Doctrine\MultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Doctrine\Point;
-use Grimzy\LaravelMysqlSpatial\Doctrine\Polygon;
+use Kndol\LaravelMysqlSpatial\Connectors\ConnectionFactory;
+use Kndol\LaravelMysqlSpatial\Doctrine\Geometry;
+use Kndol\LaravelMysqlSpatial\Doctrine\GeometryCollection;
+use Kndol\LaravelMysqlSpatial\Doctrine\LineString;
+use Kndol\LaravelMysqlSpatial\Doctrine\MultiLineString;
+use Kndol\LaravelMysqlSpatial\Doctrine\MultiPoint;
+use Kndol\LaravelMysqlSpatial\Doctrine\MultiPolygon;
+use Kndol\LaravelMysqlSpatial\Doctrine\Point;
+use Kndol\LaravelMysqlSpatial\Doctrine\Polygon;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\DatabaseServiceProvider;
 
diff --git a/src/Types/Factory.php b/src/Types/Factory.php
index 087348fa..9e43b91e 100755
--- a/src/Types/Factory.php
+++ b/src/Types/Factory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 class Factory implements \GeoIO\Factory
 {
diff --git a/src/Types/Geometry.php b/src/Types/Geometry.php
index c0df8ec3..9d3ef1b2 100644
--- a/src/Types/Geometry.php
+++ b/src/Types/Geometry.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoIO\WKB\Parser\Parser;
 use GeoJson\GeoJson;
-use Grimzy\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
+use Kndol\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
 use Illuminate\Contracts\Support\Jsonable;
 
 abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializable
@@ -82,7 +82,7 @@ public static function fromJson($geoJson)
             $geoJson = $geoJson->getGeometry();
         }
 
-        $type = '\Grimzy\LaravelMysqlSpatial\Types\\'.$geoJson->getType();
+        $type = '\Kndol\LaravelMysqlSpatial\Types\\'.$geoJson->getType();
 
         return $type::fromJson($geoJson);
     }
diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
index 2e1f0321..101c8ec2 100755
--- a/src/Types/GeometryCollection.php
+++ b/src/Types/GeometryCollection.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use ArrayAccess;
 use ArrayIterator;
 use Countable;
 use GeoJson\Feature\FeatureCollection;
 use GeoJson\GeoJson;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 use Illuminate\Contracts\Support\Arrayable;
 use InvalidArgumentException;
 use IteratorAggregate;
diff --git a/src/Types/GeometryInterface.php b/src/Types/GeometryInterface.php
index aca2bfb0..34fdb971 100644
--- a/src/Types/GeometryInterface.php
+++ b/src/Types/GeometryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 interface GeometryInterface
 {
diff --git a/src/Types/LineString.php b/src/Types/LineString.php
index 02097edd..493ce633 100644
--- a/src/Types/LineString.php
+++ b/src/Types/LineString.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\LineString as GeoJsonLineString;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
 class LineString extends PointCollection
 {
diff --git a/src/Types/MultiLineString.php b/src/Types/MultiLineString.php
index dd3342fd..a032091d 100644
--- a/src/Types/MultiLineString.php
+++ b/src/Types/MultiLineString.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiLineString as GeoJsonMultiLineString;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 use InvalidArgumentException;
 
 class MultiLineString extends GeometryCollection
diff --git a/src/Types/MultiPoint.php b/src/Types/MultiPoint.php
index fb55f9e8..bae88fa1 100644
--- a/src/Types/MultiPoint.php
+++ b/src/Types/MultiPoint.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiPoint as GeoJsonMultiPoint;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
 class MultiPoint extends PointCollection
 {
diff --git a/src/Types/MultiPolygon.php b/src/Types/MultiPolygon.php
index aba2b6d1..930695f8 100644
--- a/src/Types/MultiPolygon.php
+++ b/src/Types/MultiPolygon.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiPolygon as GeoJsonMultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 use InvalidArgumentException;
 
 class MultiPolygon extends GeometryCollection
diff --git a/src/Types/Point.php b/src/Types/Point.php
index 40719af4..b3988462 100644
--- a/src/Types/Point.php
+++ b/src/Types/Point.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Point as GeoJsonPoint;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
 class Point extends Geometry
 {
@@ -68,7 +68,7 @@ public function __toString()
     /**
      * @param $geoJson  \GeoJson\Feature\Feature|string
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\Point
+     * @return \Kndol\LaravelMysqlSpatial\Types\Point
      */
     public static function fromJson($geoJson)
     {
diff --git a/src/Types/PointCollection.php b/src/Types/PointCollection.php
index af586b28..9bdb873c 100755
--- a/src/Types/PointCollection.php
+++ b/src/Types/PointCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use ArrayAccess;
 use InvalidArgumentException;
@@ -44,7 +44,7 @@ public function offsetSet($offset, $value)
     }
 
     /**
-     * @return array|\Grimzy\LaravelMysqlSpatial\Types\Point[]
+     * @return array|\Kndol\LaravelMysqlSpatial\Types\Point[]
      */
     public function getPoints()
     {
@@ -52,7 +52,7 @@ public function getPoints()
     }
 
     /**
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $point
+     * @param \Kndol\LaravelMysqlSpatial\Types\Point $point
      *
      * @deprecated 2.1.0 Use array_unshift($multipoint, $point); instead
      * @see array_unshift
@@ -64,7 +64,7 @@ public function prependPoint(Point $point)
     }
 
     /**
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $point
+     * @param \Kndol\LaravelMysqlSpatial\Types\Point $point
      *
      * @deprecated 2.1.0 Use $multipoint[] = $point; instead
      * @see ArrayAccess
@@ -76,7 +76,7 @@ public function appendPoint(Point $point)
 
     /**
      * @param $index
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $point
+     * @param \Kndol\LaravelMysqlSpatial\Types\Point $point
      *
      * @deprecated 2.1.0 Use array_splice($multipoint, $index, 0, [$point]); instead
      * @see array_splice
diff --git a/src/Types/Polygon.php b/src/Types/Polygon.php
index 9c10cecc..9af38e12 100644
--- a/src/Types/Polygon.php
+++ b/src/Types/Polygon.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Grimzy\LaravelMysqlSpatial\Types;
+namespace Kndol\LaravelMysqlSpatial\Types;
 
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Polygon as GeoJsonPolygon;
-use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
 class Polygon extends MultiLineString
 {
diff --git a/tests/Integration/Models/GeometryModel.php b/tests/Integration/Models/GeometryModel.php
index 0b08186a..dd8ce8e2 100644
--- a/tests/Integration/Models/GeometryModel.php
+++ b/tests/Integration/Models/GeometryModel.php
@@ -1,6 +1,6 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Database\Eloquent\Model;
 
 class GeometryModel extends Model
diff --git a/tests/Integration/Models/NoSpatialFieldsModel.php b/tests/Integration/Models/NoSpatialFieldsModel.php
index 88e962a6..0f7648c7 100644
--- a/tests/Integration/Models/NoSpatialFieldsModel.php
+++ b/tests/Integration/Models/NoSpatialFieldsModel.php
@@ -1,6 +1,6 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Database\Eloquent\Model;
 
 class NoSpatialFieldsModel extends Model
diff --git a/tests/Integration/SpatialTest.php b/tests/Integration/SpatialTest.php
index 70fa3771..04e37f4f 100644
--- a/tests/Integration/SpatialTest.php
+++ b/tests/Integration/SpatialTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\SpatialServiceProvider;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryCollection;
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPoint;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\SpatialServiceProvider;
+use Kndol\LaravelMysqlSpatial\Types\GeometryCollection;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\MultiPoint;
+use Kndol\LaravelMysqlSpatial\Types\MultiPolygon;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\DB;
 use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
@@ -171,7 +171,7 @@ public function testSpatialFieldsNotDefinedException()
         $geo->geometry = new Point(1, 2);
         $geo->save();
 
-        $this->assertException(\Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException::class);
+        $this->assertException(\Kndol\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException::class);
         NoSpatialFieldsModel::all();
     }
 
@@ -377,7 +377,7 @@ public function testOrderBySpatialWithUnknownFunction()
         $loc = new GeometryModel();
         $loc->location = new Point(1, 1);
 
-        $this->assertException(\Grimzy\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException::class);
+        $this->assertException(\Kndol\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException::class);
         GeometryModel::orderBySpatial('location', $loc->location, 'does-not-exist')->get();
     }
 
@@ -451,9 +451,9 @@ public function testOrderByDistanceSphere()
     //public function testBounding() {
     //    $point = new Point(0, 0);
     //
-    //    $linestring1 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(1 1, 2 2)");
-    //    $linestring2 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(20 20, 24 24)");
-    //    $linestring3 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(0 10, 10 10)");
+    //    $linestring1 = \Kndol\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(1 1, 2 2)");
+    //    $linestring2 = \Kndol\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(20 20, 24 24)");
+    //    $linestring3 = \Kndol\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(0 10, 10 10)");
     //
     //    $geo1 = new GeometryModel();
     //    $geo1->location = $point;
diff --git a/tests/Unit/Connectors/ConnectionFactoryTest.php b/tests/Unit/Connectors/ConnectionFactoryTest.php
index ea1cdd4c..f3ab4766 100644
--- a/tests/Unit/Connectors/ConnectionFactoryTest.php
+++ b/tests/Unit/Connectors/ConnectionFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Connectors\ConnectionFactory;
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Connectors\ConnectionFactory;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
 use Illuminate\Container\Container;
 use Stubs\PDOStub;
 
diff --git a/tests/Unit/Eloquent/BuilderTest.php b/tests/Unit/Eloquent/BuilderTest.php
index b77c6c4e..15324505 100644
--- a/tests/Unit/Eloquent/BuilderTest.php
+++ b/tests/Unit/Eloquent/BuilderTest.php
@@ -3,13 +3,13 @@
 namespace Eloquent;
 
 use BaseTestCase;
-use Grimzy\LaravelMysqlSpatial\Eloquent\Builder;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Eloquent\Builder;
+use Kndol\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Query\Grammars\MySqlGrammar;
diff --git a/tests/Unit/Eloquent/SpatialTraitTest.php b/tests/Unit/Eloquent/SpatialTraitTest.php
index 717e8897..6b1fecf6 100644
--- a/tests/Unit/Eloquent/SpatialTraitTest.php
+++ b/tests/Unit/Eloquent/SpatialTraitTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Database\Eloquent\Model;
 use Mockery as m;
 
@@ -56,7 +56,7 @@ public function testInsertUpdateLineStringHasCorrectSql()
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->linestring = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $this->model->linestring = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -64,7 +64,7 @@ public function testInsertUpdateLineStringHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->linestring = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $this->model->linestring = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $this->model->save();
 
         $this->assertStringStartsWith('update', $this->queries[1]);
@@ -76,14 +76,14 @@ public function testInsertUpdatePolygonHasCorrectSql()
     {
         $point1 = new Point(1, 2);
         $point2 = new Point(2, 3);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $linestring1 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $point3 = new Point(3, 2);
         $point4 = new Point(2, 1);
-        $linestring2 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
+        $linestring2 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->polygon = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
+        $this->model->polygon = new \Kndol\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -91,7 +91,7 @@ public function testInsertUpdatePolygonHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->polygon = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
+        $this->model->polygon = new \Kndol\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
         $this->model->save();
         $this->assertStringStartsWith('update', $this->queries[1]);
         $this->assertContains('update `test_models` set `polygon` = ST_GeomFromText(?) where `id` = ?', $this->queries[1]);
@@ -105,7 +105,7 @@ public function testInsertUpdateMultiPointHasCorrectSql()
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->multipoint = new \Grimzy\LaravelMysqlSpatial\Types\MultiPoint([$point1, $point2]);
+        $this->model->multipoint = new \Kndol\LaravelMysqlSpatial\Types\MultiPoint([$point1, $point2]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -113,7 +113,7 @@ public function testInsertUpdateMultiPointHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->multipoint = new \Grimzy\LaravelMysqlSpatial\Types\MultiPoint([$point1, $point2]);
+        $this->model->multipoint = new \Kndol\LaravelMysqlSpatial\Types\MultiPoint([$point1, $point2]);
         $this->model->save();
 
         $this->assertStringStartsWith('update', $this->queries[1]);
@@ -125,14 +125,14 @@ public function testInsertUpdateMultiLineStringHasCorrectSql()
     {
         $point1 = new Point(1, 2);
         $point2 = new Point(2, 3);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $linestring1 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $point3 = new Point(3, 2);
         $point4 = new Point(2, 1);
-        $linestring2 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
+        $linestring2 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->multilinestring = new \Grimzy\LaravelMysqlSpatial\Types\MultiLineString([$linestring1, $linestring2]);
+        $this->model->multilinestring = new \Kndol\LaravelMysqlSpatial\Types\MultiLineString([$linestring1, $linestring2]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -140,7 +140,7 @@ public function testInsertUpdateMultiLineStringHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->multilinestring = new \Grimzy\LaravelMysqlSpatial\Types\MultiLineString([$linestring1, $linestring2]);
+        $this->model->multilinestring = new \Kndol\LaravelMysqlSpatial\Types\MultiLineString([$linestring1, $linestring2]);
         $this->model->save();
         $this->assertStringStartsWith('update', $this->queries[1]);
         $this->assertContains('update `test_models` set `multilinestring` = ST_GeomFromText(?) where `id` = ?', $this->queries[1]);
@@ -151,23 +151,23 @@ public function testInsertUpdateMultiPolygonHasCorrectSql()
     {
         $point1 = new Point(1, 2);
         $point2 = new Point(2, 3);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $linestring1 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $point3 = new Point(3, 2);
         $point4 = new Point(2, 1);
-        $linestring2 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
-        $polygon1 = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
+        $linestring2 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
+        $polygon1 = new \Kndol\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2]);
 
         $point5 = new Point(4, 5);
         $point6 = new Point(5, 6);
-        $linestring3 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
+        $linestring3 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
         $point7 = new Point(6, 5);
         $point8 = new Point(5, 4);
-        $linestring4 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point7, $point8]);
-        $polygon2 = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring3, $linestring4]);
+        $linestring4 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point7, $point8]);
+        $polygon2 = new \Kndol\LaravelMysqlSpatial\Types\Polygon([$linestring3, $linestring4]);
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->multipolygon = new \Grimzy\LaravelMysqlSpatial\Types\MultiPolygon([$polygon1, $polygon2]);
+        $this->model->multipolygon = new \Kndol\LaravelMysqlSpatial\Types\MultiPolygon([$polygon1, $polygon2]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -175,7 +175,7 @@ public function testInsertUpdateMultiPolygonHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->multipolygon = new \Grimzy\LaravelMysqlSpatial\Types\MultiPolygon([$polygon1, $polygon2]);
+        $this->model->multipolygon = new \Kndol\LaravelMysqlSpatial\Types\MultiPolygon([$polygon1, $polygon2]);
         $this->model->save();
         $this->assertStringStartsWith('update', $this->queries[1]);
         $this->assertContains('update `test_models` set `multipolygon` = ST_GeomFromText(?) where `id` = ?', $this->queries[1]);
@@ -187,11 +187,11 @@ public function testInsertUpdateGeometryCollectionHasCorrectSql()
         $point1 = new Point(1, 2);
         $point2 = new Point(2, 3);
         $point3 = new Point(3, 3);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point2, $point3]);
+        $linestring1 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point2, $point3]);
 
         $this->assertFalse($this->model->exists);
 
-        $this->model->geometrycollection = new \Grimzy\LaravelMysqlSpatial\Types\GeometryCollection([$point1, $linestring1]);
+        $this->model->geometrycollection = new \Kndol\LaravelMysqlSpatial\Types\GeometryCollection([$point1, $linestring1]);
         $this->model->save();
 
         $this->assertStringStartsWith('insert', $this->queries[0]);
@@ -199,7 +199,7 @@ public function testInsertUpdateGeometryCollectionHasCorrectSql()
         // TODO: assert bindings in query
         $this->assertTrue($this->model->exists);
 
-        $this->model->geometrycollection = new \Grimzy\LaravelMysqlSpatial\Types\GeometryCollection([$point1, $linestring1]);
+        $this->model->geometrycollection = new \Kndol\LaravelMysqlSpatial\Types\GeometryCollection([$point1, $linestring1]);
         $this->model->save();
         $this->assertStringStartsWith('update', $this->queries[1]);
         $this->assertContains('update `test_models` set `geometrycollection` = ST_GeomFromText(?) where `id` = ?', $this->queries[1]);
@@ -226,7 +226,7 @@ public function testScopeDistance()
         $point = new Point(1, 2);
         $query = TestModel::distance('point', $point, 10);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -241,7 +241,7 @@ public function testScopeDistanceExcludingSelf()
         $point = new Point(1, 2);
         $query = TestModel::distanceExcludingSelf('point', $point, 10);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -258,7 +258,7 @@ public function testScopeDistanceSphere()
         $point = new Point(1, 2);
         $query = TestModel::distanceSphere('point', $point, 10);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -273,7 +273,7 @@ public function testScopeDistanceSphereExcludingSelf()
         $point = new Point(1, 2);
         $query = TestModel::distanceSphereExcludingSelf('point', $point, 10);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -290,7 +290,7 @@ public function testScopeDistanceValue()
         $point = new Point(1, 2);
         $query = TestModel::distanceValue('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->columns);
         $bindings = $q->getRawBindings()['select'];
@@ -306,7 +306,7 @@ public function testScopeDistanceValueWithSelect()
         $point = new Point(1, 2);
         $query = TestModel::select('some_column')->distanceValue('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->columns);
         $bindings = $q->getRawBindings()['select'];
@@ -322,7 +322,7 @@ public function testScopeDistanceSphereValue()
         $point = new Point(1, 2);
         $query = TestModel::distanceSphereValue('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->columns);
         $bindings = $q->getRawBindings()['select'];
@@ -338,7 +338,7 @@ public function testScopeDistanceSphereValueWithSelect()
         $point = new Point(1, 2);
         $query = TestModel::select('some_column')->distanceSphereValue('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->columns);
         $bindings = $q->getRawBindings()['select'];
@@ -353,22 +353,22 @@ private function buildTestPolygon()
     {
         $point1 = new Point(1, 1);
         $point2 = new Point(1, 2);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
+        $linestring1 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
         $point3 = new Point(1, 2);
         $point4 = new Point(2, 2);
-        $linestring2 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
+        $linestring2 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
         $point5 = new Point(2, 2);
         $point6 = new Point(1, 1);
-        $linestring3 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
+        $linestring3 = new \Kndol\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
 
-        return new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
+        return new \Kndol\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
     }
 
     public function testScopeComparison()
     {
         $query = TestModel::comparison('point', $this->buildTestPolygon(), 'within');
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -381,7 +381,7 @@ public function testScopeWithin()
     {
         $query = TestModel::within('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -394,7 +394,7 @@ public function testScopeCrosses()
     {
         $query = TestModel::crosses('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -407,7 +407,7 @@ public function testScopeContains()
     {
         $query = TestModel::contains('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -420,7 +420,7 @@ public function testScopeDisjoint()
     {
         $query = TestModel::disjoint('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -433,7 +433,7 @@ public function testScopeEquals()
     {
         $query = TestModel::equals('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -446,7 +446,7 @@ public function testScopeIntersects()
     {
         $query = TestModel::intersects('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -459,7 +459,7 @@ public function testScopeOverlaps()
     {
         $query = TestModel::overlaps('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -472,7 +472,7 @@ public function testScopeDoesTouch()
     {
         $query = TestModel::doesTouch('point', $this->buildTestPolygon());
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $bindings = $q->getRawBindings()['where'];
@@ -484,7 +484,7 @@ public function testScopeDoesTouch()
     public function testScopeOrderBySpatialThrowsExceptionWhenFunctionNotRegistered()
     {
         $point = new Point(1, 2);
-        $this->assertException(\Grimzy\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException::class);
+        $this->assertException(\Kndol\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException::class);
         TestModel::orderBySpatial('point', $point, 'does-not-exist');
     }
 
@@ -493,7 +493,7 @@ public function testScopeOrderByDistance()
         $point = new Point(1, 2);
         $query = TestModel::orderByDistance('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->orders);
         $bindings = $q->getRawBindings()['order'];
@@ -507,7 +507,7 @@ public function testScopeOrderByDistanceSphere()
         $point = new Point(1, 2);
         $query = TestModel::orderByDistanceSphere('point', $point);
 
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $this->assertInstanceOf(\Kndol\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->orders);
         $bindings = $q->getRawBindings()['order'];
@@ -519,7 +519,7 @@ public function testScopeOrderByDistanceSphere()
 
 class TestModel extends Model
 {
-    use \Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+    use \Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
     protected $spatialFields = ['point'];   // TODO: only required when fetching, not saving
 
@@ -562,7 +562,7 @@ public function testmodels()
 
 class TestNoSpatialModel extends Model
 {
-    use \Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+    use \Kndol\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 }
 
 class TestPDO extends PDO
diff --git a/tests/Unit/MysqlConnectionTest.php b/tests/Unit/MysqlConnectionTest.php
index c630d990..56ba6b99 100644
--- a/tests/Unit/MysqlConnectionTest.php
+++ b/tests/Unit/MysqlConnectionTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
-use Grimzy\LaravelMysqlSpatial\Schema\Builder;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Schema\Builder;
 use Stubs\PDOStub;
 
 class MysqlConnectionTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Unit/Schema/BlueprintTest.php b/tests/Unit/Schema/BlueprintTest.php
index da335520..8fd9c5e7 100644
--- a/tests/Unit/Schema/BlueprintTest.php
+++ b/tests/Unit/Schema/BlueprintTest.php
@@ -3,7 +3,7 @@
 namespace Schema;
 
 use BaseTestCase;
-use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
+use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
 use Mockery;
 
 class BlueprintTest extends BaseTestCase
diff --git a/tests/Unit/Schema/BuilderTest.php b/tests/Unit/Schema/BuilderTest.php
index 27371d09..afda825f 100644
--- a/tests/Unit/Schema/BuilderTest.php
+++ b/tests/Unit/Schema/BuilderTest.php
@@ -3,9 +3,9 @@
 namespace Schema;
 
 use BaseTestCase;
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
-use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
-use Grimzy\LaravelMysqlSpatial\Schema\Builder;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
+use Kndol\LaravelMysqlSpatial\Schema\Builder;
 use Mockery;
 
 class BuilderTest extends BaseTestCase
diff --git a/tests/Unit/Schema/Grammars/MySqlGrammarTest.php b/tests/Unit/Schema/Grammars/MySqlGrammarTest.php
index 4773a2ea..8902adf4 100644
--- a/tests/Unit/Schema/Grammars/MySqlGrammarTest.php
+++ b/tests/Unit/Schema/Grammars/MySqlGrammarTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\MysqlConnection;
-use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
-use Grimzy\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
+use Kndol\LaravelMysqlSpatial\MysqlConnection;
+use Kndol\LaravelMysqlSpatial\Schema\Blueprint;
+use Kndol\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
 
 class MySqlGrammarBaseTest extends BaseTestCase
 {
diff --git a/tests/Unit/Types/GeometryCollectionTest.php b/tests/Unit/Types/GeometryCollectionTest.php
index 07759c5f..25a13615 100644
--- a/tests/Unit/Types/GeometryCollectionTest.php
+++ b/tests/Unit/Types/GeometryCollectionTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\GeometryCollection;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Types\GeometryCollection;
+use Kndol\LaravelMysqlSpatial\Types\GeometryInterface;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 
 class GeometryCollectionTest extends BaseTestCase
 {
@@ -101,7 +101,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         GeometryCollection::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
 
diff --git a/tests/Unit/Types/GeometryTest.php b/tests/Unit/Types/GeometryTest.php
index 8bd765a7..716de7ea 100644
--- a/tests/Unit/Types/GeometryTest.php
+++ b/tests/Unit/Types/GeometryTest.php
@@ -1,14 +1,14 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
-use Grimzy\LaravelMysqlSpatial\Types\Geometry;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryCollection;
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiLineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPoint;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
+use Kndol\LaravelMysqlSpatial\Types\Geometry;
+use Kndol\LaravelMysqlSpatial\Types\GeometryCollection;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\MultiLineString;
+use Kndol\LaravelMysqlSpatial\Types\MultiPoint;
+use Kndol\LaravelMysqlSpatial\Types\MultiPolygon;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 
 class GeometryTest extends BaseTestCase
 {
diff --git a/tests/Unit/Types/LineStringTest.php b/tests/Unit/Types/LineStringTest.php
index 9300e3f1..fddaf4d7 100644
--- a/tests/Unit/Types/LineStringTest.php
+++ b/tests/Unit/Types/LineStringTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\Point;
 
 class LineStringTest extends BaseTestCase
 {
@@ -45,7 +45,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         LineString::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
 
diff --git a/tests/Unit/Types/MultiLineStringTest.php b/tests/Unit/Types/MultiLineStringTest.php
index df7b42e4..ac041945 100644
--- a/tests/Unit/Types/MultiLineStringTest.php
+++ b/tests/Unit/Types/MultiLineStringTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiLineString;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\MultiLineString;
+use Kndol\LaravelMysqlSpatial\Types\Point;
 
 class MultiLineStringTest extends BaseTestCase
 {
@@ -45,7 +45,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         MultiLineString::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
 
diff --git a/tests/Unit/Types/MultiPointTest.php b/tests/Unit/Types/MultiPointTest.php
index 1e9bf7f4..171e386b 100644
--- a/tests/Unit/Types/MultiPointTest.php
+++ b/tests/Unit/Types/MultiPointTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\MultiPoint;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\MultiPoint;
+use Kndol\LaravelMysqlSpatial\Types\Point;
 
 class MultiPointTest extends BaseTestCase
 {
@@ -42,7 +42,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         MultiPoint::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
 
diff --git a/tests/Unit/Types/MultiPolygonTest.php b/tests/Unit/Types/MultiPolygonTest.php
index cf5894ff..d2b708e8 100644
--- a/tests/Unit/Types/MultiPolygonTest.php
+++ b/tests/Unit/Types/MultiPolygonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\MultiPolygon;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 
 class MultiPolygonTest extends BaseTestCase
 {
@@ -65,7 +65,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         MultiPolygon::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
 
diff --git a/tests/Unit/Types/PointTest.php b/tests/Unit/Types/PointTest.php
index 257f6a45..d1218268 100644
--- a/tests/Unit/Types/PointTest.php
+++ b/tests/Unit/Types/PointTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Point;
 
 class PointTest extends BaseTestCase
 {
@@ -63,7 +63,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         Point::fromJson('{"type": "LineString","coordinates":[[1,1],[2,2]]}');
     }
 
diff --git a/tests/Unit/Types/PolygonTest.php b/tests/Unit/Types/PolygonTest.php
index de923c2f..986ff95d 100644
--- a/tests/Unit/Types/PolygonTest.php
+++ b/tests/Unit/Types/PolygonTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Kndol\LaravelMysqlSpatial\Types\LineString;
+use Kndol\LaravelMysqlSpatial\Types\Point;
+use Kndol\LaravelMysqlSpatial\Types\Polygon;
 
 class PolygonTest extends BaseTestCase
 {
@@ -56,7 +56,7 @@ public function testFromJson()
 
     public function testInvalidGeoJsonException()
     {
-        $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
+        $this->setExpectedException(\Kndol\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         Polygon::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }