--- gmap.module
+++ gmap.module
@@ -1165,24 +1165,12 @@
 }
 
 /**
- * Implementation of hook_keys_service(). (from the keys api)
- */
-function gmap_keys_service() {
-  return array(
-    'gmap' => array(
-      'name' => t('Gmap'),
-      'description' => t('Google Maps API Key'),
-    ),
-  );
-}
-
-/**
  * Retrieve the Google Maps key that is in use for the site.
  */
 function gmap_get_key() {
   $key = variable_get('googlemap_api_key', '');
-  if (module_exists('keys_api')) {
-    $key = keys_api_get_key('gmap', $_SERVER['HTTP_HOST']);
+  if (module_exists('keys')) {
+    $key = keys_get_key('google_maps');
   }
   return $key;
 }
--- gmap_settings_ui.inc
+++ gmap_settings_ui.inc
@@ -17,7 +17,7 @@
     '#type' => 'fieldset',
     '#title' => t('Google Map Initialize'),
   );
-  if (!module_exists('keys_api')) {
+  if (!module_exists('keys')) {
     $form['initialization']['googlemap_api_key'] = array(
       '#type' => 'textfield',
       '#title' => t('Google Maps API Key'),
@@ -32,7 +32,7 @@
       '#type' => 'item',
       '#title' => t('Google Maps API Key'),
       '#description' => t('Your personal Googlemaps API key.  You must get this for each separate website at <a href="http://www.google.com/apis/maps/">Google Map API website</a>.'),
-      '#value' => t("Managed by <a href='@url'>keys api</a>.", array('@url' => url('admin/settings/keys'))),
+      '#value' => t("Managed by <a href='@url'>Keys</a>.", array('@url' => url('admin/settings/keys'))),
     );
   }