diff --git a/lib/jsduck/format/class.rb b/lib/jsduck/format/class.rb
index b17dc462902a909ce99788268254b8ac800cd38c..46e343ee24a6835ec0e174c551e35642fc7c702b 100644
--- a/lib/jsduck/format/class.rb
+++ b/lib/jsduck/format/class.rb
@@ -42,7 +42,7 @@ module JsDuck
       def format_member(m)
         @formatter.doc_context = m[:files][0]
 
-        # Turn off type parsing for CSS vars and mixins
+        # Turn off type parsing for SCSS vars and mixins
         @formatter.skip_type_parsing = [:css_var, :css_mixin].include?(m[:tagname])
 
         format_tags(m)
diff --git a/lib/jsduck/format/doc.rb b/lib/jsduck/format/doc.rb
index 07379e7b3f5b0aa353c7c01e0bca517dbf463fa8..81050d3b1c650660e4b7668f4ead1912c5ab8683 100644
--- a/lib/jsduck/format/doc.rb
+++ b/lib/jsduck/format/doc.rb
@@ -148,7 +148,7 @@ module JsDuck
 
       # Turns type parsing on or off.
       #
-      # Used to skipping parsing of CSS var and mixin types.
+      # Used to skipping parsing of SCSS var and mixin types.
       def skip_type_parsing=(skip)
         @subproperties.skip_type_parsing = skip
       end
diff --git a/lib/jsduck/format/subproperties.rb b/lib/jsduck/format/subproperties.rb
index 9ccda1e35bfe19499f2f7b66a06a5fe7278788a3..ccb3c2eca7a03d62d6ca1bf03b28b8ff3d1e4a10 100644
--- a/lib/jsduck/format/subproperties.rb
+++ b/lib/jsduck/format/subproperties.rb
@@ -14,7 +14,7 @@ module JsDuck
       end
 
       # Set to true to skip parsing and formatting of types.
-      # Used to skip parsing of CSS typesdefs.
+      # Used to skip parsing of SCSS typesdefs.
       attr_accessor :skip_type_parsing
 
       # Takes a hash of param, return value, throws value or subproperty.
diff --git a/lib/jsduck/options/input_files.rb b/lib/jsduck/options/input_files.rb
index 8e1ecf12d7bce9c8f24f96275ffbdf1f269194c6..31003b5aa284f3d305c746486c9f3b9a02d21f7e 100644
--- a/lib/jsduck/options/input_files.rb
+++ b/lib/jsduck/options/input_files.rb
@@ -12,7 +12,7 @@ module JsDuck
 
       # Expands opts.input_files (modifying its contents):
       #
-      # - When file is a directory, scans all JS, CSS, SCSS files in there.
+      # - When file is a directory, scans all JS, SCSS files in there.
       # - When file is a .jsb3 file, extracts list of files from it.
       # - Otherwise returns array with this same input filename.
       #
@@ -33,7 +33,7 @@ module JsDuck
 
         if File.exists?(fname)
           if File.directory?(fname)
-            Dir[fname+"/**/*.{js,css,scss}"].each {|f| files << f }
+            Dir[fname+"/**/*.{js,scss}"].each {|f| files << f }
           elsif fname =~ /\.jsb3$/
             Options::Jsb.read(fname).each {|fn| read_filenames(fn) }
           else
diff --git a/lib/jsduck/parser.rb b/lib/jsduck/parser.rb
index df4492a395d18d373e1cfdde9ba5aa7c18d9e1e7..dc88458d715a2e4d0a3bc2f417f3d81d15bc153d 100644
--- a/lib/jsduck/parser.rb
+++ b/lib/jsduck/parser.rb
@@ -9,7 +9,7 @@ require 'jsduck/base_type'
 require 'jsduck/class_doc_expander'
 
 module JsDuck
-  # Performs the actual parsing of CSS or JS source.
+  # Performs the actual parsing of SCSS or JS source.
   #
   # This is the class that brings together all the different steps of
   # parsing the source.
@@ -27,7 +27,7 @@ module JsDuck
     def parse(contents, filename="", options={})
       @doc_processor.filename = @filename = filename
 
-      parse_js_or_css(contents, filename, options).map do |docset|
+      parse_js_or_scss(contents, filename, options).map do |docset|
         expand(docset)
       end.flatten.map do |docset|
         merge(docset)
@@ -36,9 +36,9 @@ module JsDuck
 
     private
 
-    # Parses the file depending on filename as JS or CSS
-    def parse_js_or_css(contents, filename, options)
-      if filename =~ /\.s?css$/
+    # Parses the file depending on filename as JS or SCSS
+    def parse_js_or_scss(contents, filename, options)
+      if filename =~ /\.scss$/
         docs = Css::Parser.new(contents, options).parse
       else
         docs = Js::Parser.new(contents, options).parse
diff --git a/lib/jsduck/source/file.rb b/lib/jsduck/source/file.rb
index e05df2d7c7db7d74a1dd35efa3a6d307863ae520..2760291a9be6389fc5aa9fb55799680ef6e0fa86 100644
--- a/lib/jsduck/source/file.rb
+++ b/lib/jsduck/source/file.rb
@@ -3,10 +3,10 @@ require 'jsduck/util/html'
 module JsDuck
   module Source
 
-    # Represents one JavaScript or CSS source file.
+    # Represents one JavaScript or SCSS source file.
     #
     # The filename parameter determines whether it's parsed as
-    # JavaScript (the default) or CSS.
+    # JavaScript (the default) or SCSS.
     class File
       attr_reader :filename
       attr_reader :contents
diff --git a/lib/jsduck/web/source.rb b/lib/jsduck/web/source.rb
index e45ff7bbef714e14491b89f79225e60bc8a11da3..aeb47d5449794517df317025dc56cb27eef57c4e 100644
--- a/lib/jsduck/web/source.rb
+++ b/lib/jsduck/web/source.rb
@@ -5,7 +5,7 @@ require 'fileutils'
 module JsDuck
   module Web
 
-    # Writes HTML JavaScript/CSS source into HTML files.
+    # Writes HTML JavaScript/SCSS source into HTML files.
     class Source
       def initialize(source_files)
         @source_files = source_files
diff --git a/spec/aggregator_css_spec.rb b/spec/aggregator_css_spec.rb
index 60060913491a23646a5203a5edea56d801a94d0d..a43016a85c5ff69b6e1f69d8f00b0f5b6a6bd621 100644
--- a/spec/aggregator_css_spec.rb
+++ b/spec/aggregator_css_spec.rb
@@ -3,7 +3,7 @@ require "mini_parser"
 describe JsDuck::Aggregator do
 
   def parse(string)
-    Helper::MiniParser.parse(string, {:filename => ".css"})
+    Helper::MiniParser.parse(string, {:filename => ".scss"})
   end
 
   def parse_member(string)