diff --git a/.analysis_options_flutter_analyze b/.analysis_options_repo
similarity index 100%
rename from .analysis_options_flutter_analyze
rename to .analysis_options_repo
diff --git a/packages/flutter_tools/flutter_analysis_options b/.analysis_options_user
similarity index 100%
rename from packages/flutter_tools/flutter_analysis_options
rename to .analysis_options_user
diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart
index 80315de14fa..742eb328bd6 100644
--- a/packages/flutter_tools/lib/src/commands/analyze.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -218,8 +218,8 @@ class AnalyzeCommand extends FlutterCommand {
     options.dartSdkPath = argResults['dart-sdk'];
     options.packageMap = packages;
     options.analysisOptionsFile = flutterRepo
-      ? path.join(Cache.flutterRoot, '.analysis_options_flutter_analyze')
-      : path.join(Cache.flutterRoot, 'packages', 'flutter_tools', 'flutter_analysis_options');
+      ? path.join(Cache.flutterRoot, '.analysis_options_repo')
+      : path.join(Cache.flutterRoot, '.analysis_options_user');
     AnalysisDriver analyzer = new AnalysisDriver(options);
 
     // TODO(pq): consider error handling