diff --git a/gulpfile.js b/gulpfile.js
index 7f8920f..8c84b3e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,11 +52,11 @@ gulp.task('release', ['clean-release', 'compile'], function () {
 
 		return rjs({
 			baseUrl: '/out/',
-			name: 'hl/yaml/' + moduleId,
+			name: 'vs/languages/yaml/' + moduleId,
 			out: moduleId + '.js',
 			exclude: exclude,
 			paths: {
-				'hl/yaml': __dirname + '/out'
+				'vs/languages/yaml': __dirname + '/out'
 			},
 			packages: [{
 				name: 'yaml-ast-parser',
@@ -100,7 +100,7 @@ gulp.task('release', ['clean-release', 'compile'], function () {
 
 	return merge(
 		merge(
-			bundleOne('monaco.contribution', ['hl/yaml/yamlMode']),
+			bundleOne('monaco.contribution', ['vs/languages/yaml/yamlMode']),
 			bundleOne('yamlMode'),
 			bundleOne('yamlWorker')
 		)
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index 78a7b02..da34a5a 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -62,13 +62,15 @@ monaco.languages.yaml = createAPI();
 // --- Registration to monaco editor ---
 
 function withMode(callback: (module: typeof mode) => void): void {
-	require<typeof mode>(['hl/yaml/yamlMode'], callback);
+	require<typeof mode>(['vs/languages/yaml/yamlMode'], callback);
 }
 
-// monaco.languages.register({
-// 	id: 'yaml',
-// 	extensions: ['.yml'],
-// });
+monaco.languages.register({
+	id: 'yaml',
+	extensions: ['.yaml', '.yml'],
+	aliases: ['YAML', 'yaml', 'YML', 'yml'],
+	mimetypes: ['application/x-yaml']
+});
 monaco.languages.onLanguage('yaml', () => {
 	withMode(mode => mode.setupMode(yamlDefaults));
 });
diff --git a/src/workerManager.ts b/src/workerManager.ts
index 43d025b..63d5827 100644
--- a/src/workerManager.ts
+++ b/src/workerManager.ts
@@ -62,7 +62,7 @@ export class WorkerManager {
 			this._worker = monaco.editor.createWebWorker<YAMLWorker>({
 
 				// module that exports the create() method and returns a `YAMLWorker` instance
-				moduleId: 'hl/yaml/yamlWorker',
+				moduleId: 'vs/languages/yaml/yamlWorker',
 
 				label: this._defaults.languageId,
 
diff --git a/test/index.html b/test/index.html
index 9043a2d..9abd2d9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,7 +15,7 @@
 	var require = {
 		paths: {
 			'vs/basic-languages': '../node_modules/monaco-languages/release',
-			'vs/language/json': '../release/dev',
+			'vs/language/yaml': '../release/dev',
 			'vs': '../node_modules/monaco-editor-core/dev/vs'
 		}
 	};
@@ -27,7 +27,7 @@
 <script>
 	require([
 		'vs/basic-languages/src/monaco.contribution',
-		'vs/language/json/monaco.contribution'
+		'vs/language/yaml/monaco.contribution'
 	], function() {
 		var editor = monaco.editor.create(document.getElementById('container'), {
 			value: [
@@ -100,7 +100,7 @@
 				'	}',
 				'}',
 			].join('\n'),
-			language: 'json'
+			language: 'yaml'
 		});
 	});
 </script>