diff --git a/src/app/theme/components/baWizard/baWizard.html b/src/app/theme/components/baWizard/baWizard.html
index e744ceb..16c24b0 100644
--- a/src/app/theme/components/baWizard/baWizard.html
+++ b/src/app/theme/components/baWizard/baWizard.html
@@ -1,11 +1,11 @@
-<div class="wizard">
-    <div class="wizard-navigation-container">
-        <div ng-repeat="t in $baWizardController.tabs" class="wizard-navigation {{$baWizardController.tabNum == $index ? 'active' : ''}}" ng-click="$baWizardController.selectTab($index)">
+<div class="ba-wizard">
+    <div class="ba-wizard-navigation-container">
+        <div ng-repeat="t in $baWizardController.tabs" class="ba-wizard-navigation {{$baWizardController.tabNum == $index ? 'active' : ''}}" ng-click="$baWizardController.selectTab($index)">
             {{t.title}}
         </div>
     </div>
 
-    <div class="progress progress-wizard">
+    <div class="progress ba-wizard-progress">
         <div class="progress-bar progress-bar-info active" role="progressbar"
              aria-valuemin="0" aria-valuemax="100" ng-style="{width: $baWizardController.progress + '%'}">
         </div>
@@ -14,7 +14,7 @@
     <div class="steps" ng-transclude></div>
 
     <nav>
-        <ul class="pager wizard-pager">
+        <ul class="pager ba-wizard-pager">
             <li class="previous"><button  ng-disabled="$baWizardController.isFirstTab()" ng-click="$baWizardController.previousTab()" type="button" class=" btn btn-primary"><span aria-hidden="true">&larr;</span> previous</button></li>
             <li class="next"> <button ng-disabled="$baWizardController.isLastTab()" ng-click="$baWizardController.nextTab()" type="button" class="btn btn-primary">next <span aria-hidden="true">&rarr;</span></button></li>
         </ul>
diff --git a/src/app/theme/components/baWizard/baWizardStep.html b/src/app/theme/components/baWizard/baWizardStep.html
index f1b36ce..1610f06 100644
--- a/src/app/theme/components/baWizard/baWizardStep.html
+++ b/src/app/theme/components/baWizard/baWizardStep.html
@@ -1 +1 @@
-<section ng-show="selected" class="tab" ng-transclude></section>
\ No newline at end of file
+<section ng-show="selected" class="step" ng-transclude></section>
\ No newline at end of file
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index 018606f..237edeb 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -491,36 +491,4 @@ label.custom-input-danger {
 }
 .progress-bar-danger {
   background-color: $danger;
-}
-
-.progress-wizard {
-  margin-top: 10px;
-  height: 10px;
-}
-
-.wizard-pager {
-  .previous {
-    float: left;
-  }
-  .next {
-    float: right;
-  }
-}
-
-.wizard-navigation-container {
-  display: table;
-  table-layout: fixed;
-  width: 100%;
-  padding: 15px 0;
-  .wizard-navigation {
-    cursor: pointer;
-    display: table-cell;
-    line-height: 1;
-    text-align: center;
-    font-weight: 100;
-    font-size: 18px;
-    &.active {
-      color: $primary-dark;
-    }
-  }
 }
\ No newline at end of file
diff --git a/src/sass/theme/components/_baWizard.scss b/src/sass/theme/components/_baWizard.scss
new file mode 100644
index 0000000..5ffd705
--- /dev/null
+++ b/src/sass/theme/components/_baWizard.scss
@@ -0,0 +1,31 @@
+.ba-wizard-progress {
+  margin-top: 10px;
+  height: 10px;
+}
+
+.ba-wizard-pager {
+  .previous {
+    float: left;
+  }
+  .next {
+    float: right;
+  }
+}
+
+.ba-wizard-navigation-container {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  padding: 15px 0;
+  .ba-wizard-navigation {
+    cursor: pointer;
+    display: table-cell;
+    line-height: 1;
+    text-align: center;
+    font-weight: 100;
+    font-size: 18px;
+    &.active {
+      color: $primary-dark;
+    }
+  }
+}
\ No newline at end of file