diff --git a/src/pivotal-ui/components/alerts.css.scss b/src/pivotal-ui/components/alerts.scss
similarity index 100%
rename from src/pivotal-ui/components/alerts.css.scss
rename to src/pivotal-ui/components/alerts.scss
diff --git a/src/pivotal-ui/components/back_to_top.css.scss b/src/pivotal-ui/components/back_to_top.scss
similarity index 100%
rename from src/pivotal-ui/components/back_to_top.css.scss
rename to src/pivotal-ui/components/back_to_top.scss
diff --git a/src/pivotal-ui/components/backgrounds.css.scss b/src/pivotal-ui/components/backgrounds.scss
similarity index 100%
rename from src/pivotal-ui/components/backgrounds.css.scss
rename to src/pivotal-ui/components/backgrounds.scss
diff --git a/src/pivotal-ui/components/button.css.scss b/src/pivotal-ui/components/buttons.scss
similarity index 100%
rename from src/pivotal-ui/components/button.css.scss
rename to src/pivotal-ui/components/buttons.scss
diff --git a/src/pivotal-ui/components/code.css.scss b/src/pivotal-ui/components/code.scss
similarity index 100%
rename from src/pivotal-ui/components/code.css.scss
rename to src/pivotal-ui/components/code.scss
diff --git a/src/pivotal-ui/components/collapse.css.scss b/src/pivotal-ui/components/collapse.scss
similarity index 100%
rename from src/pivotal-ui/components/collapse.css.scss
rename to src/pivotal-ui/components/collapse.scss
diff --git a/src/pivotal-ui/components/colors.css.scss b/src/pivotal-ui/components/colors.scss
similarity index 100%
rename from src/pivotal-ui/components/colors.css.scss
rename to src/pivotal-ui/components/colors.scss
diff --git a/src/pivotal-ui/components/dividers.css.scss b/src/pivotal-ui/components/dividers.scss
similarity index 100%
rename from src/pivotal-ui/components/dividers.css.scss
rename to src/pivotal-ui/components/dividers.scss
diff --git a/src/pivotal-ui/components/ellipsis.css.scss b/src/pivotal-ui/components/ellipsis.scss
similarity index 100%
rename from src/pivotal-ui/components/ellipsis.css.scss
rename to src/pivotal-ui/components/ellipsis.scss
diff --git a/src/pivotal-ui/components/embeds.css.scss b/src/pivotal-ui/components/embeds.scss
similarity index 100%
rename from src/pivotal-ui/components/embeds.css.scss
rename to src/pivotal-ui/components/embeds.scss
diff --git a/src/pivotal-ui/components/fonts.css.scss b/src/pivotal-ui/components/fonts.scss
similarity index 100%
rename from src/pivotal-ui/components/fonts.css.scss
rename to src/pivotal-ui/components/fonts.scss
diff --git a/src/pivotal-ui/components/forms.css.scss b/src/pivotal-ui/components/forms.scss
similarity index 99%
rename from src/pivotal-ui/components/forms.css.scss
rename to src/pivotal-ui/components/forms.scss
index bdf57d707..c771a00dd 100644
--- a/src/pivotal-ui/components/forms.css.scss
+++ b/src/pivotal-ui/components/forms.scss
@@ -523,7 +523,7 @@ Use this with fields that require telephone numbers to pop up the dialpad on mob
 
 /*doc
 ---
-title: Validation
+title: Validations
 name: form_validation
 categories:
  - All
diff --git a/src/pivotal-ui/components/gravatar.css.scss b/src/pivotal-ui/components/gravatars.scss
similarity index 100%
rename from src/pivotal-ui/components/gravatar.css.scss
rename to src/pivotal-ui/components/gravatars.scss
diff --git a/src/pivotal-ui/components/grids.css.scss b/src/pivotal-ui/components/grids.scss
similarity index 100%
rename from src/pivotal-ui/components/grids.css.scss
rename to src/pivotal-ui/components/grids.scss
diff --git a/src/pivotal-ui/components/health_indicators.css.scss b/src/pivotal-ui/components/health_indicators.scss
similarity index 100%
rename from src/pivotal-ui/components/health_indicators.css.scss
rename to src/pivotal-ui/components/health_indicators.scss
diff --git a/src/pivotal-ui/components/hoverable.css.scss b/src/pivotal-ui/components/hoverable.scss
similarity index 100%
rename from src/pivotal-ui/components/hoverable.css.scss
rename to src/pivotal-ui/components/hoverable.scss
diff --git a/src/pivotal-ui/components/iconography.css.scss b/src/pivotal-ui/components/iconography.scss
similarity index 100%
rename from src/pivotal-ui/components/iconography.css.scss
rename to src/pivotal-ui/components/iconography.scss
diff --git a/src/pivotal-ui/components/image.css.scss b/src/pivotal-ui/components/images.scss
similarity index 100%
rename from src/pivotal-ui/components/image.css.scss
rename to src/pivotal-ui/components/images.scss
diff --git a/src/pivotal-ui/components/inline_modal.css.scss b/src/pivotal-ui/components/inline_modals.scss
similarity index 100%
rename from src/pivotal-ui/components/inline_modal.css.scss
rename to src/pivotal-ui/components/inline_modals.scss
diff --git a/src/pivotal-ui/components/intro.css.scss b/src/pivotal-ui/components/intro.scss
similarity index 100%
rename from src/pivotal-ui/components/intro.css.scss
rename to src/pivotal-ui/components/intro.scss
diff --git a/src/pivotal-ui/components/labels.css.scss b/src/pivotal-ui/components/labels.scss
similarity index 100%
rename from src/pivotal-ui/components/labels.css.scss
rename to src/pivotal-ui/components/labels.scss
diff --git a/src/pivotal-ui/components/layout_lists.css.scss b/src/pivotal-ui/components/layout_lists.scss
similarity index 100%
rename from src/pivotal-ui/components/layout_lists.css.scss
rename to src/pivotal-ui/components/layout_lists.scss
diff --git a/src/pivotal-ui/components/links.css.scss b/src/pivotal-ui/components/links.scss
similarity index 100%
rename from src/pivotal-ui/components/links.css.scss
rename to src/pivotal-ui/components/links.scss
diff --git a/src/pivotal-ui/components/lists.css.scss b/src/pivotal-ui/components/lists.scss
similarity index 100%
rename from src/pivotal-ui/components/lists.css.scss
rename to src/pivotal-ui/components/lists.scss
diff --git a/src/pivotal-ui/components/map.css.scss b/src/pivotal-ui/components/maps.scss
similarity index 99%
rename from src/pivotal-ui/components/map.css.scss
rename to src/pivotal-ui/components/maps.scss
index b912b7d69..152bb24b5 100644
--- a/src/pivotal-ui/components/map.css.scss
+++ b/src/pivotal-ui/components/maps.scss
@@ -1,6 +1,6 @@
 /*doc
 ---
-title: Map
+title: Maps
 name: map
 categories:
   - All
diff --git a/src/pivotal-ui/components/media.css.scss b/src/pivotal-ui/components/media.scss
similarity index 100%
rename from src/pivotal-ui/components/media.css.scss
rename to src/pivotal-ui/components/media.scss
diff --git a/src/pivotal-ui/components/mixins.css.scss b/src/pivotal-ui/components/mixins.scss
similarity index 100%
rename from src/pivotal-ui/components/mixins.css.scss
rename to src/pivotal-ui/components/mixins.scss
diff --git a/src/pivotal-ui/components/modals.css.scss b/src/pivotal-ui/components/modals.scss
similarity index 100%
rename from src/pivotal-ui/components/modals.css.scss
rename to src/pivotal-ui/components/modals.scss
diff --git a/src/pivotal-ui/components/panel.css.scss b/src/pivotal-ui/components/panels.scss
similarity index 100%
rename from src/pivotal-ui/components/panel.css.scss
rename to src/pivotal-ui/components/panels.scss
diff --git a/src/pivotal-ui/components/pane.css.scss b/src/pivotal-ui/components/panes.scss
similarity index 100%
rename from src/pivotal-ui/components/pane.css.scss
rename to src/pivotal-ui/components/panes.scss
diff --git a/src/pivotal-ui/components/product_specific.css.scss b/src/pivotal-ui/components/product_specific.scss
similarity index 100%
rename from src/pivotal-ui/components/product_specific.css.scss
rename to src/pivotal-ui/components/product_specific.scss
diff --git a/src/pivotal-ui/components/progress_bar.css.scss b/src/pivotal-ui/components/progress_bars.scss
similarity index 100%
rename from src/pivotal-ui/components/progress_bar.css.scss
rename to src/pivotal-ui/components/progress_bars.scss
diff --git a/src/pivotal-ui/components/ribbons.css.scss b/src/pivotal-ui/components/ribbons.scss
similarity index 100%
rename from src/pivotal-ui/components/ribbons.css.scss
rename to src/pivotal-ui/components/ribbons.scss
diff --git a/src/pivotal-ui/components/scale.css.scss b/src/pivotal-ui/components/scales.scss
similarity index 100%
rename from src/pivotal-ui/components/scale.css.scss
rename to src/pivotal-ui/components/scales.scss
diff --git a/src/pivotal-ui/components/spinners.css.scss b/src/pivotal-ui/components/spinners.scss
similarity index 100%
rename from src/pivotal-ui/components/spinners.css.scss
rename to src/pivotal-ui/components/spinners.scss
diff --git a/src/pivotal-ui/components/table.css.scss b/src/pivotal-ui/components/tables.scss
similarity index 100%
rename from src/pivotal-ui/components/table.css.scss
rename to src/pivotal-ui/components/tables.scss
diff --git a/src/pivotal-ui/components/tabs.css.scss b/src/pivotal-ui/components/tabs.scss
similarity index 100%
rename from src/pivotal-ui/components/tabs.css.scss
rename to src/pivotal-ui/components/tabs.scss
diff --git a/src/pivotal-ui/components/toggle.css.scss b/src/pivotal-ui/components/toggles.scss
similarity index 100%
rename from src/pivotal-ui/components/toggle.css.scss
rename to src/pivotal-ui/components/toggles.scss
diff --git a/src/pivotal-ui/components/tooltip.css.scss b/src/pivotal-ui/components/tooltips.scss
similarity index 100%
rename from src/pivotal-ui/components/tooltip.css.scss
rename to src/pivotal-ui/components/tooltips.scss
diff --git a/src/pivotal-ui/components/traffic_lights.css.scss b/src/pivotal-ui/components/traffic_lights.scss
similarity index 100%
rename from src/pivotal-ui/components/traffic_lights.css.scss
rename to src/pivotal-ui/components/traffic_lights.scss
diff --git a/src/pivotal-ui/components/typography.css.scss b/src/pivotal-ui/components/typography.scss
similarity index 100%
rename from src/pivotal-ui/components/typography.css.scss
rename to src/pivotal-ui/components/typography.scss
diff --git a/src/pivotal-ui/components/utils.css.scss b/src/pivotal-ui/components/utils.scss
similarity index 100%
rename from src/pivotal-ui/components/utils.css.scss
rename to src/pivotal-ui/components/utils.scss
diff --git a/src/pivotal-ui/components/variables.css.scss b/src/pivotal-ui/components/variables.scss
similarity index 100%
rename from src/pivotal-ui/components/variables.css.scss
rename to src/pivotal-ui/components/variables.scss
diff --git a/src/pivotal-ui/components/whitespace.css.scss b/src/pivotal-ui/components/whitespace.scss
similarity index 100%
rename from src/pivotal-ui/components/whitespace.css.scss
rename to src/pivotal-ui/components/whitespace.scss
diff --git a/src/pivotal-ui/frameworks/bootstrap-sass-v3.2.0.scss b/src/pivotal-ui/frameworks/bootstrap-sass-v3.2.0.scss
index a8e17b235..8d6f527cc 100644
--- a/src/pivotal-ui/frameworks/bootstrap-sass-v3.2.0.scss
+++ b/src/pivotal-ui/frameworks/bootstrap-sass-v3.2.0.scss
@@ -1,6 +1,6 @@
 // Core variables and mixins
 //@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
-@import "../components/mixins.css.scss";
+@import "../components/mixins.scss";
 @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
 
 // Reset and dependencies
diff --git a/src/pivotal-ui/frameworks/oocss.css.scss b/src/pivotal-ui/frameworks/oocss.scss
similarity index 100%
rename from src/pivotal-ui/frameworks/oocss.css.scss
rename to src/pivotal-ui/frameworks/oocss.scss
diff --git a/src/pivotal-ui/pivotal-ui.scss b/src/pivotal-ui/pivotal-ui.scss
index cde88f75b..9d18f30f8 100644
--- a/src/pivotal-ui/pivotal-ui.scss
+++ b/src/pivotal-ui/pivotal-ui.scss
@@ -1,49 +1,49 @@
 // Nothing can go before variables!
-@import "components/variables.css.scss";
+@import "components/variables.scss";
 
 @import "compass/css3";
 @import "compass/typography";
-@import "components/mixins.css.scss";
-@import "components/fonts.css.scss";
+@import "components/mixins.scss";
+@import "components/fonts.scss";
 
 @import "frameworks/bootstrap-sass-v3.2.0.scss";
-@import "frameworks/oocss.css.scss";
+@import "frameworks/oocss.scss";
 
-@import "components/utils.css.scss";
+@import "components/utils.scss";
 
-@import "components/colors.css.scss";
-@import "components/backgrounds.css.scss";
-@import "components/whitespace.css.scss";
-@import "components/typography.css.scss";
-@import "components/iconography.css.scss";
-@import "components/button.css.scss";
-@import "components/links.css.scss";
-@import "components/grids.css.scss";
-@import "components/media.css.scss";
-@import "components/table.css.scss";
-@import "components/panel.css.scss";
-@import "components/alerts.css.scss";
-@import "components/dividers.css.scss";
-@import "components/lists.css.scss";
-@import "components/tabs.css.scss";
-@import "components/ellipsis.css.scss";
-@import "components/collapse.css.scss";
-@import "components/forms.css.scss";
-@import "components/modals.css.scss";
-@import "components/gravatar.css.scss";
-@import "components/toggle.css.scss";
-@import "components/spinners.css.scss";
-@import "components/tooltip.css.scss";
-@import "components/progress_bar.css.scss";
-@import "components/traffic_lights.css.scss";
-@import "components/hoverable.css.scss";
-@import "components/inline_modal.css.scss";
-@import "components/code.css.scss";
-@import "components/image.css.scss";
-@import "components/pane.css.scss";
-@import "components/scale.css.scss";
-@import "components/map.css.scss";
-@import "components/labels.css.scss";
-@import "components/ribbons.css.scss";
-@import "components/embeds.css.scss";
-@import "components/back_to_top.css.scss";
+@import "components/colors.scss";
+@import "components/backgrounds.scss";
+@import "components/whitespace.scss";
+@import "components/typography.scss";
+@import "components/iconography.scss";
+@import "components/buttons.scss";
+@import "components/links.scss";
+@import "components/grids.scss";
+@import "components/media.scss";
+@import "components/tables.scss";
+@import "components/panels.scss";
+@import "components/alerts.scss";
+@import "components/dividers.scss";
+@import "components/lists.scss";
+@import "components/tabs.scss";
+@import "components/ellipsis.scss";
+@import "components/collapse.scss";
+@import "components/forms.scss";
+@import "components/modals.scss";
+@import "components/gravatars.scss";
+@import "components/toggles.scss";
+@import "components/spinners.scss";
+@import "components/tooltips.scss";
+@import "components/progress_bars.scss";
+@import "components/traffic_lights.scss";
+@import "components/hoverable.scss";
+@import "components/inline_modals.scss";
+@import "components/code.scss";
+@import "components/images.scss";
+@import "components/panes.scss";
+@import "components/scales.scss";
+@import "components/maps.scss";
+@import "components/labels.scss";
+@import "components/ribbons.scss";
+@import "components/embeds.scss";
+@import "components/back_to_top.scss";
diff --git a/src/style_guide/style_guide.scss b/src/style_guide/style_guide.scss
index d9c515e7f..24cce9f98 100644
--- a/src/style_guide/style_guide.scss
+++ b/src/style_guide/style_guide.scss
@@ -1,7 +1,7 @@
 // Styles specific to the styleguide, otherwise, not used
 @import 'compass';
-@import '../pivotal-ui/components/variables.css.scss';
-@import '../pivotal-ui/components/mixins.css.scss';
+@import '../pivotal-ui/components/variables.scss';
+@import '../pivotal-ui/components/mixins.scss';
 
 html {
   background-color: $gray-9;