diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index fa2ebc11a96..4834f6ac4b4 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -17,10 +17,10 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IFileMatch, IFileSearchProviderStats, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { FileIndexSearchManager, IDirectoryEntry, IDirectoryTree, IInternalFileMatch } from 'vs/workbench/api/node/extHostSearch.fileIndex';
-import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchEH';
+import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchProvider';
 import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
 import { QueryGlobTester, resolvePatternsForProvider } from 'vs/workbench/services/search/node/search';
-import { TextSearchEngine } from 'vs/workbench/services/search/node/textSearchEngine';
+import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
 import * as vscode from 'vscode';
 import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
 
@@ -127,7 +127,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		}
 
 		const query = reviveQuery(rawQuery);
-		const engine = new TextSearchEngine(pattern, query, provider, this._extfs);
+		const engine = new TextSearchManager(pattern, query, provider, this._extfs);
 		return engine.search(progress => this._proxy.$handleTextMatch(handle, session, progress), token);
 	}
 }
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index 6ffec5235a8..2d3cf2bec6f 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -23,7 +23,7 @@ import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textS
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
 import { IFileSearchProgressItem, IRawFileMatch, IRawSearch, IRawSearchService, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess } from './search';
-import { BatchedCollector } from 'vs/workbench/services/search/node/textSearchEngine';
+import { BatchedCollector } from 'vs/workbench/services/search/node/textSearchManager';
 
 gracefulFs.gracefulify(fs);
 
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchEH.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
similarity index 98%
rename from src/vs/workbench/services/search/node/ripgrepSearchEH.ts
rename to src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
index 58db2799369..0c3478effa6 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchEH.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
@@ -5,7 +5,7 @@
 
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
-import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
+import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
 import * as vscode from 'vscode';
 
 export class RipgrepSearchProvider implements vscode.TextSearchProvider {
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEH.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
similarity index 99%
rename from src/vs/workbench/services/search/node/ripgrepTextSearchEH.ts
rename to src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index d0197f813b0..87cc6a75193 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEH.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -43,7 +43,7 @@ export class RipgrepTextSearchEngine {
 			let rgProc: Maybe<cp.ChildProcess> = cp.spawn(rgDiskPath, rgArgs, { cwd });
 			rgProc.on('error', e => {
 				console.error(e);
-				// this.outputChannel.append('Error: ' + (e && e.message));
+				this.outputChannel.appendLine('Error: ' + (e && e.message));
 				reject(e);
 			});
 
diff --git a/src/vs/workbench/services/search/node/textSearchAdapter.ts b/src/vs/workbench/services/search/node/textSearchAdapter.ts
index e1708cafad3..0decf578e3a 100644
--- a/src/vs/workbench/services/search/node/textSearchAdapter.ts
+++ b/src/vs/workbench/services/search/node/textSearchAdapter.ts
@@ -7,8 +7,8 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
 import * as extfs from 'vs/base/node/extfs';
 import { IFolderQuery, IProgress, ISearchQuery, ITextSearchStats, QueryType, IFileMatch } from 'vs/platform/search/common/search';
-import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
-import { TextSearchEngine } from 'vs/workbench/services/search/node/textSearchEngine';
+import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
+import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
 import { IRawSearch, ISerializedFileMatch, ISerializedSearchSuccess } from './search';
 
 export class TextSearchEngineAdapter {
@@ -61,7 +61,7 @@ export class TextSearchEngineAdapter {
 				onMessage({ message: msg });
 			}
 		};
-		const textSearchEngine = new TextSearchEngine(this.config.contentPattern, query, new RipgrepTextSearchEngine(pretendOutputChannel), extfs);
+		const textSearchEngine = new TextSearchManager(this.config.contentPattern, query, new RipgrepTextSearchEngine(pretendOutputChannel), extfs);
 		textSearchEngine
 			.search(
 				matches => {
diff --git a/src/vs/workbench/services/search/node/textSearchEngine.ts b/src/vs/workbench/services/search/node/textSearchManager.ts
similarity index 99%
rename from src/vs/workbench/services/search/node/textSearchEngine.ts
rename to src/vs/workbench/services/search/node/textSearchManager.ts
index 57a4d3b1860..828819afaad 100644
--- a/src/vs/workbench/services/search/node/textSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/textSearchManager.ts
@@ -15,7 +15,7 @@ import { IFileMatch, IFolderQuery, IPatternInfo, ISearchCompleteStats, ISearchQu
 import * as vscode from 'vscode';
 import { QueryGlobTester, resolvePatternsForProvider } from 'vs/workbench/services/search/node/search';
 
-export class TextSearchEngine {
+export class TextSearchManager {
 
 	private collector: TextSearchResultsCollector;
 
diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
index 38b1deab33d..666116d9378 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { fixRegexEndingPattern } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
+import { fixRegexEndingPattern } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
 
 suite('RipgrepTextSearch - etc', () => {
 	test('fixRegexEndingPattern', () => {