diff --git a/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart b/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart
index 0c4b3e1b7fd..5da637c1574 100644
--- a/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart
+++ b/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:test/test.dart';
 
-import '../../../tool/completion_metrics/metrics_util.dart';
+import '../../../tool/code_completion/metrics_util.dart';
 
 void main() {
   group('ArithmeticMeanComputer', () {
diff --git a/pkg/analysis_server/tool/completion_metrics/code_metrics.dart b/pkg/analysis_server/tool/code_completion/code_metrics.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/code_metrics.dart
rename to pkg/analysis_server/tool/code_completion/code_metrics.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/completion_metrics.dart b/pkg/analysis_server/tool/code_completion/completion_metrics.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/completion_metrics.dart
rename to pkg/analysis_server/tool/code_completion/completion_metrics.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/corpus.dart b/pkg/analysis_server/tool/code_completion/corpus.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/corpus.dart
rename to pkg/analysis_server/tool/code_completion/corpus.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/data/itsallwidgets_repos.txt b/pkg/analysis_server/tool/code_completion/data/itsallwidgets_repos.txt
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/data/itsallwidgets_repos.txt
rename to pkg/analysis_server/tool/code_completion/data/itsallwidgets_repos.txt
diff --git a/pkg/analysis_server/tool/completion_metrics/flutter_metrics.dart b/pkg/analysis_server/tool/code_completion/flutter_metrics.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/flutter_metrics.dart
rename to pkg/analysis_server/tool/code_completion/flutter_metrics.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/implicit_type_declarations.dart b/pkg/analysis_server/tool/code_completion/implicit_type_declarations.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/implicit_type_declarations.dart
rename to pkg/analysis_server/tool/code_completion/implicit_type_declarations.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/metrics_util.dart b/pkg/analysis_server/tool/code_completion/metrics_util.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/metrics_util.dart
rename to pkg/analysis_server/tool/code_completion/metrics_util.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/output_utilities.dart b/pkg/analysis_server/tool/code_completion/output_utilities.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/output_utilities.dart
rename to pkg/analysis_server/tool/code_completion/output_utilities.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart
rename to pkg/analysis_server/tool/code_completion/relevance_metrics.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart b/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart
rename to pkg/analysis_server/tool/code_completion/relevance_table_generator.dart
diff --git a/pkg/analysis_server/tool/completion_metrics/visitors.dart b/pkg/analysis_server/tool/code_completion/visitors.dart
similarity index 100%
rename from pkg/analysis_server/tool/completion_metrics/visitors.dart
rename to pkg/analysis_server/tool/code_completion/visitors.dart