diff --git a/README.md b/README.md
index 7fedb0d..5776633 100644
--- a/README.md
+++ b/README.md
@@ -256,10 +256,10 @@ google_maps|Paris, France|POINT(2.352222 48.856614)
 google_maps|Copenhagen, Denmark|POINT(12.568337 55.676097)
 google_maps|74.200.247.59|The GoogleMapsProvider does not support IP addresses.
 google_maps|::ffff:66.147.244.214|The GoogleMapsProvider does not support IP addresses.
-openstreetmaps|Paris, France|POINT(2.352133 48.856506)
-openstreetmaps|Copenhagen, Denmark|POINT(12.570072 55.686724)
-openstreetmaps|74.200.247.59|Could not execute query http://nominatim.openstreetmap.org/search?q=74.200.247.59&format=xml&addressdetails=1&limit=1
-openstreetmaps|::ffff:66.147.244.214|The OpenStreetMapProvider does not support IPv6 addresses.
+openstreetmap|Paris, France|POINT(2.352133 48.856506)
+openstreetmap|Copenhagen, Denmark|POINT(12.570072 55.686724)
+openstreetmap|74.200.247.59|Could not execute query http://nominatim.openstreetmap.org/search?q=74.200.247.59&format=xml&addressdetails=1&limit=1
+openstreetmap|::ffff:66.147.244.214|The OpenStreetMapProvider does not support IPv6 addresses.
 bing_maps|Paris, France|Could not execute query http://dev.virtualearth.net/REST/v1/Locations/?q=Paris%2C+France&key=<FAKE_API_KEY>
 bing_maps|Copenhagen, Denmark|Could not execute query http://dev.virtualearth.net/REST/v1/Locations/?q=Copenhagen%2C+Denmark&key=<FAKE_API_KEY>
 bing_maps|74.200.247.59|The BingMapsProvider does not support IP addresses.
@@ -502,7 +502,7 @@ $ php geotools geocoder:geocode Paris --dumper=wkt // POINT(2.352222 48.856614)
 ...
 $ php geotools geocoder:reverse "48.8631507, 2.388911" // Avenue Gambetta 10, 75020 Paris
 $ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" // Paris, Île-De-France, France
-$ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" --provider="openstreetmaps"
+$ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" --provider="openstreetmap"
 // Paris, Île-De-France, France Métropolitaine
 ...
 $ php geotools geocoder:geocode "Tagensvej 47, Copenhagen" --raw --args=da_DK --args=Denmark
diff --git a/src/CLI/Command/Geocoder/Command.php b/src/CLI/Command/Geocoder/Command.php
index 688da35..23250b2 100644
--- a/src/CLI/Command/Geocoder/Command.php
+++ b/src/CLI/Command/Geocoder/Command.php
@@ -32,7 +32,7 @@ class Command extends \Symfony\Component\Console\Command\Command
         'google_maps'          => 'GoogleMaps',
         'google_maps_business' => 'GoogleMapsBusiness',
         'bing_maps'            => 'BingMaps',
-        'openstreetmaps'       => 'OpenStreetMap',
+        'openstreetmap'        => 'OpenStreetMap',
         'cloudmade'            => 'CloudMade',
         'geoip'                => 'Geoip',
         'map_quest'            => 'MapQuest',
diff --git a/src/CLI/Command/Geocoder/Geocode.php b/src/CLI/Command/Geocoder/Geocode.php
index f2d6214..e34caec 100644
--- a/src/CLI/Command/Geocoder/Geocode.php
+++ b/src/CLI/Command/Geocoder/Geocode.php
@@ -52,9 +52,9 @@ protected function configure()
 
     %command.full_name% paris <comment>--adapter=socket --dumper=wkt</comment>
 
-<info>Use the OpenStreetMaps provider with the default adapter</info>:
+<info>Use the OpenStreetMap provider with the default adapter</info>:
 
-    %command.full_name% paris <comment>--provider=openstreetmaps</comment>
+    %command.full_name% paris <comment>--provider=openstreetmap</comment>
 
 <info>Use the FreeGeoIp provider with the socket adapter</info>
 
diff --git a/src/CLI/Command/Geocoder/Reverse.php b/src/CLI/Command/Geocoder/Reverse.php
index 0448506..7bb2b0f 100644
--- a/src/CLI/Command/Geocoder/Reverse.php
+++ b/src/CLI/Command/Geocoder/Reverse.php
@@ -54,9 +54,9 @@ protected function configure()
 
     %command.full_name% "48.8631507, 2.388911" <comment>--format="%L, %R, %C" --adapter=socket</comment>
 
-<info>Use the OpenStreetMaps provider with the default adapter</info>:
+<info>Use the OpenStreetMap provider with the default adapter</info>:
 
-    %command.full_name% "48.8631507, 2.388911" <comment>--provider=openstreetmaps</comment>
+    %command.full_name% "48.8631507, 2.388911" <comment>--provider=openstreetmap</comment>
 EOT
             );
     }
diff --git a/tests/CLI/Command/Geocoder/ReverseTest.php b/tests/CLI/Command/Geocoder/ReverseTest.php
index 927fb24..b74c77f 100644
--- a/tests/CLI/Command/Geocoder/ReverseTest.php
+++ b/tests/CLI/Command/Geocoder/ReverseTest.php
@@ -85,28 +85,28 @@ public function testExecuteReverseWithDefaultProviderAndSocketAdapterAndArgument
         $this->assertMatchesRegularExpression('/Avenue Gambetta 1, 75020 Paris/', $this->commandTester->getDisplay());
     }
 
-    public function testExecuteReverseAgainstOpenStreetMapsProviderWithDefaultAdapterAndDefaultFormatter()
+    public function testExecuteReverseAgainstOpenStreetMapProviderWithDefaultAdapterAndDefaultFormatter()
     {
         $this->markTestIncomplete();
 
         $this->commandTester->execute(array(
             'command'    => $this->command->getName(),
             'coordinate' => '48.8631507, 2.388911',
-            '--provider' => 'openstreetmaps',
+            '--provider' => 'openstreetmap',
         ));
 
         $this->assertTrue(is_string($this->commandTester->getDisplay()));
         $this->assertMatchesRegularExpression('/Avenue Gambetta 8, 75020 Paris/', $this->commandTester->getDisplay());
     }
 
-    public function testExecuteReverseAgainstOpenStreetMapsProviderWithDefaultAdapterAndFormatter()
+    public function testExecuteReverseAgainstOpenStreetMapProviderWithDefaultAdapterAndFormatter()
     {
         $this->markTestIncomplete();
 
         $this->commandTester->execute(array(
             'command'    => $this->command->getName(),
             'coordinate' => '48.8631507, 2.388911',
-            '--provider' => 'openstreetmaps',
+            '--provider' => 'openstreetmap',
             '--format'   => '%L, %A1, %C',
         ));