Rename the plugin location key and directory name

pkg/analysis_server/lib/src/plugin/plugin_locator.dart

Index: pkg/analysis_server/lib/src/plugin/plugin_locator.dart
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_locator.dart b/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
index 0566680be15be6f849df6e378d2f724ef2ffb880..8f9a30c5204dcf34ddc98e998adbf4b38c832392 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
@@ -13,13 +13,13 @@ class PluginLocator {
    * The key used in the `pubspec.yaml` file to specify the location of the
    * analysis plugin.
    */
-  static const String analysisPluginKey = 'analysis_plugin';
+  static const String analyzerPluginKey = 'analyzer_plugin';
 
   /**
    * The name of the default plugin directory, located within the `tools`
    * directory.
    */
-  static const String defaultPluginFolderName = 'analysis_plugin';
+  static const String defaultPluginFolderName = 'analyzer_plugin';
 
   /**
    * The name of the `pubspec.yaml` file.
@@ -79,7 +79,7 @@ class PluginLocator {
             sourceUrl: pubspecFile.toUri());
         YamlNode contents = document.contents;
         if (contents is YamlMap) {
-          String pluginPath = contents[analysisPluginKey];
+          String pluginPath = contents[analyzerPluginKey];
           if (pluginPath != null) {
             Folder pluginFolder =
                 packageFolder.getChildAssumingFolder(pluginPath);