diff --git a/extensions/css/server/src/parser/scssErrors.ts b/extensions/css/server/src/parser/scssErrors.ts
index 2a25d3a0042..ee3692665a9 100644
--- a/extensions/css/server/src/parser/scssErrors.ts
+++ b/extensions/css/server/src/parser/scssErrors.ts
@@ -20,7 +20,7 @@ export class SCSSIssueType implements nodes.IRule {
 }
 
 export var SCSSParseError = {
-	FromExpected: new SCSSIssueType('sass-fromexpected', localize('expected.from', "'from' expected")),
-	ThroughOrToExpected: new SCSSIssueType('sass-throughexpected', localize('expected.through', "'through' or 'to' expected")),
-	InExpected: new SCSSIssueType('sass-fromexpected', localize('expected.in', "'in' expected")),
+	FromExpected: new SCSSIssueType('scss-fromexpected', localize('expected.from', "'from' expected")),
+	ThroughOrToExpected: new SCSSIssueType('scss-throughexpected', localize('expected.through', "'through' or 'to' expected")),
+	InExpected: new SCSSIssueType('scss-fromexpected', localize('expected.in', "'in' expected")),
 };
diff --git a/extensions/css/server/src/parser/scssParser.ts b/extensions/css/server/src/parser/scssParser.ts
index fa9b6955347..0f2a159f84e 100644
--- a/extensions/css/server/src/parser/scssParser.ts
+++ b/extensions/css/server/src/parser/scssParser.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
-import * as sassScanner from './scssScanner';
+import * as scssScanner from './scssScanner';
 import {TokenType} from './cssScanner';
 import * as cssParser from './cssParser';
 import * as nodes from './cssNodes';
@@ -12,13 +12,13 @@ import {SCSSParseError} from './scssErrors';
 import {ParseError} from './cssErrors';
 
 /// <summary>
-/// A parser for Sass
+/// A parser for scss
 /// http://sass-lang.com/documentation/file.SASS_REFERENCE.html
 /// </summary>
 export class SCSSParser extends cssParser.Parser {
 
 	public constructor() {
-		super(new sassScanner.SCSSScanner());
+		super(new scssScanner.SCSSScanner());
 	}
 
 	public _parseStylesheetStatement(): nodes.Node {
@@ -52,7 +52,7 @@ export class SCSSParser extends cssParser.Parser {
 		return this.finish(node);
 	}
 
-	// Sass variables: $font-size: 12px;
+	// scss variables: $font-size: 12px;
 	public _parseVariableDeclaration(panic: TokenType[] = []): nodes.VariableDeclaration {
 		let node = <nodes.VariableDeclaration>this.create(nodes.VariableDeclaration);
 
@@ -92,7 +92,7 @@ export class SCSSParser extends cssParser.Parser {
 
 	public _parseVariable(): nodes.Variable {
 		let node = <nodes.Variable>this.create(nodes.Variable);
-		if (!this.accept(sassScanner.VariableName)) {
+		if (!this.accept(scssScanner.VariableName)) {
 			return null;
 		}
 		return <nodes.Variable>node;
@@ -128,7 +128,7 @@ export class SCSSParser extends cssParser.Parser {
 
 	public _parseInterpolation(): nodes.Node {
 		let node = this.create(nodes.Interpolation);
-		if (this.accept(sassScanner.InterpolationFunction)) {
+		if (this.accept(scssScanner.InterpolationFunction)) {
 			if (!node.addChild(this._parseBinaryExpr())) {
 				return this.finish(node, ParseError.ExpressionExpected);
 			}
@@ -141,8 +141,8 @@ export class SCSSParser extends cssParser.Parser {
 	}
 
 	public _parseOperator(): nodes.Node {
-		if (this.peek(sassScanner.EqualsOperator) || this.peek(sassScanner.NotEqualsOperator)
-			|| this.peek(sassScanner.GreaterEqualsOperator) || this.peek(sassScanner.SmallerEqualsOperator)
+		if (this.peek(scssScanner.EqualsOperator) || this.peek(scssScanner.NotEqualsOperator)
+			|| this.peek(scssScanner.GreaterEqualsOperator) || this.peek(scssScanner.SmallerEqualsOperator)
 			|| this.peek(TokenType.Delim, '>') || this.peek(TokenType.Delim, '<')
 			|| this.peek(TokenType.Ident, 'and') || this.peek(TokenType.Ident, 'or')
 			|| this.peek(TokenType.Delim, '%')
@@ -447,7 +447,7 @@ export class SCSSParser extends cssParser.Parser {
 			return null;
 		}
 
-		if (this.accept(sassScanner.Ellipsis)) {
+		if (this.accept(scssScanner.Ellipsis)) {
 			// ok
 		}
 
@@ -515,7 +515,7 @@ export class SCSSParser extends cssParser.Parser {
 		let argument = this._parseVariable();
 		if (argument) {
 			if (!this.accept(TokenType.Colon)) {
-				if (this.accept(sassScanner.Ellipsis)) { // optional
+				if (this.accept(scssScanner.Ellipsis)) { // optional
 					node.setValue(argument);
 					return this.finish(node);
 				} else {
diff --git a/extensions/css/server/src/parser/scssScanner.ts b/extensions/css/server/src/parser/scssScanner.ts
index 929cc24b91f..2daaca3fd2c 100644
--- a/extensions/css/server/src/parser/scssScanner.ts
+++ b/extensions/css/server/src/parser/scssScanner.ts
@@ -43,7 +43,7 @@ export class SCSSScanner extends Scanner {
 
 		const offset = this.stream.pos();
 
-		// sass variable
+		// scss variable
 		if (this.stream.advanceIfChar(_DLR)) {
 			const content = ['$'];
 			if (this.ident(content)) {
@@ -53,7 +53,7 @@ export class SCSSScanner extends Scanner {
 			}
 		}
 
-		// Sass: interpolation function #{..})
+		// scss: interpolation function #{..})
 		if (this.stream.advanceIfChars([_HSH, _CUL])) {
 			return this.finishToken(offset, InterpolationFunction);
 		}
diff --git a/extensions/css/server/src/test/scss/example.scss b/extensions/css/server/src/test/scss/example.scss
index 4fb3e5cc3ca..436b46a3d59 100644
--- a/extensions/css/server/src/test/scss/example.scss
+++ b/extensions/css/server/src/test/scss/example.scss
@@ -1,4 +1,4 @@
-// snippets from the Sass documentation at http://sass-lang.com/
+// snippets from the scss documentation at http://sass-lang.com/
 
 /* css stuff */
 /* charset */
diff --git a/extensions/css/server/src/test/scss/parser.test.ts b/extensions/css/server/src/test/scss/parser.test.ts
index cdfb58aa9bb..96887f4ba69 100644
--- a/extensions/css/server/src/test/scss/parser.test.ts
+++ b/extensions/css/server/src/test/scss/parser.test.ts
@@ -76,7 +76,7 @@ suite('SCSS - Parser', () => {
 		assertError('(20 + 20', parser, parser._parseExpr.bind(parser), ParseError.RightParenthesisExpected);
 	});
 
-	test('SassOperator', function () {
+	test('SCSSOperator', function () {
 		let parser = new SCSSParser();
 		assertNode('>=', parser, parser._parseOperator.bind(parser));
 		assertNode('>', parser, parser._parseOperator.bind(parser));