diff --git a/.vscodeignore b/.vscodeignore
index 199df5d080ac599a81ddcf0ec835a82cb82aff1a..b8c2027f19f412073b5aaccf63ae395a1f6df84d 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -1,6 +1,6 @@
 .vscode/**
 .vscode-test/**
 .gitignore
-media/**
+media/screencapture.gif
 optionAdder.py
 vsc-extension-quickstart.md
diff --git a/client/src/extension.ts b/client/src/extension.ts
index 984be111edf5da084ec2f0f8b572c0a94ee8f49b..2f46f77ca67671a9beb49b6c7689a5149b9c7419 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -39,7 +39,7 @@ export function activate(context: ExtensionContext) {
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {
 		// Register the server for B, EventB documents
-		documentSelector: [{ scheme: 'file', language: 'classicalB' }, { scheme: 'file', language: 'eventB' }],
+		documentSelector: [{ scheme: 'file', language: 'classicalb' }, { scheme: 'file', language: 'eventb' }],
 		synchronize: {
 			// Notify the server about file changes to '.clientrc files contained in the workspace
 			fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
diff --git a/prob2-ui.png b/media/prob2-ui.png
similarity index 100%
rename from prob2-ui.png
rename to media/prob2-ui.png
diff --git a/package.json b/package.json
index d605544791298f11300e4cf6193fa9cf7e02a508..acf5483a97480a62007d39fef5f11a95e3880bdf 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "b-eventb-language-extension",
-	"displayName": "b-eventb language extension",
-	"description": "compiler support for b and eventb via ProB",
+	"displayName": "B/Event-B/ProB language extension",
+	"description": "Compiler and language support for B and Event-B via ProB",
 	"version": "0.3.0",
 	"publisher": "SeeBasTStick",
-	"icon": "prob2-ui.png",
+	"icon": "media/prob2-ui.png",
 	"author": "Sebastian Stock",
 	"license": "MIT",
 	"repository": {
@@ -24,8 +24,8 @@
 		"ProB"
 	],
 	"activationEvents": [
-		"onLanguage:classicalB",
-		"onLanguage:eventB"
+		"onLanguage:classicalb",
+		"onLanguage:event"
 	],
 	"main": "./client/out/extension",
 	"contributes": {
@@ -78,7 +78,7 @@
 		},
 		"languages": [
 			{
-				"id": "classicalB",
+				"id": "classicalb",
 				"extensions": [
 					".mch",
 					".def",
@@ -91,7 +91,7 @@
 				]
 			},
 			{
-				"id": "eventB",
+				"id": "eventb",
 				"extensions": [
 					".sys"
 				],