diff --git a/src/GPSPoint.php b/src/GpsPoint.php
similarity index 96%
rename from src/GPSPoint.php
rename to src/GpsPoint.php
index f637d87eb..1facd5320 100644
--- a/src/GPSPoint.php
+++ b/src/GpsPoint.php
@@ -9,7 +9,7 @@
 
 namespace Zend\Validator;
 
-final class GPSPoint extends AbstractValidator
+final class GpsPoint extends AbstractValidator
 {
 
     const OUT_OF_BOUNDS = 'gpsPointOutOfBounds';
@@ -39,7 +39,7 @@ final class GPSPoint extends AbstractValidator
     public function isValid($value)
     {
         if (strpos($value, ',') === false) {
-            $this->error(GPSPoint::INCOMPLETE_COORDINATE, $value);
+            $this->error(GpsPoint::INCOMPLETE_COORDINATE, $value);
             return false;
         }
 
diff --git a/test/GPSPointTest.php b/test/GPSPointTest.php
index 39a7322d3..a149efa91 100644
--- a/test/GPSPointTest.php
+++ b/test/GPSPointTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Validator;
 
-use Zend\Validator\GPSPoint;
+use Zend\Validator\GpsPoint;
 
 
 /**
@@ -19,13 +19,13 @@ class GPSPointTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var GPSPoint
+     * @var GpsPoint
      */
     protected $validator;
 
     public function setUp()
     {
-        $this->validator = new GPSPoint();
+        $this->validator = new GpsPoint();
     }
 
 
@@ -75,9 +75,9 @@ public function basicDataProvider()
     public function ErrorMessageTestValues()
     {
         return [
-            ['63 47 24.691 N, 18 2 54.363 W', GPSPoint::OUT_OF_BOUNDS, '63 47 24.691 N'],
-            ['° \' " N,° \' " E', GPSPoint::CONVERT_ERROR, '° \' " N'],
-            ['° \' " N', GPSPoint::INCOMPLETE_COORDINATE, '° \' " N'],
+            ['63 47 24.691 N, 18 2 54.363 W', GpsPoint::OUT_OF_BOUNDS, '63 47 24.691 N'],
+            ['° \' " N,° \' " E', GpsPoint::CONVERT_ERROR, '° \' " N'],
+            ['° \' " N', GpsPoint::INCOMPLETE_COORDINATE, '° \' " N'],
         ];
     }
 }