Use more specific name for renderOcticons

src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts

@@ -7,7 +7,7 @@
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as dom from 'vs/base/browser/dom';
 import * as objects from 'vs/base/common/objects';
-import { render as renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 
 export interface IHighlight {
 	start: number;

src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts

@@ -24,7 +24,7 @@ class MockOcticonLabel {
 }
 
 var mock: typeof octiconLabel = {
-	render: render,
+	renderOcticons: render,
 	OcticonLabel: <any>MockOcticonLabel
 };
 export = mock;
\ No newline at end of file

src/vs/base/browser/ui/octiconLabel/octiconLabel.ts

@@ -14,20 +14,20 @@ function expand(text: string): string {
 	});
 }
 
-export function render(label: string): string {
+export function renderOcticons(label: string): string {
 	return expand(escape(label));
 }
 
 export class OcticonLabel {
 
-	private _container: HTMLElement;
+	private readonly _container: HTMLElement;
 
 	constructor(container: HTMLElement) {
 		this._container = container;
 	}
 
 	set text(text: string) {
-		this._container.innerHTML = render(text || '');
+		this._container.innerHTML = renderOcticons(text || '');
 	}
 
 	set title(title: string) {

src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts

@@ -47,7 +47,7 @@ import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { Command } from 'vs/editor/common/modes';
-import { render as renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import * as platform from 'vs/base/common/platform';
 import { format } from 'vs/base/common/strings';