diff --git a/app/generator.js b/app/generator.js
index 00fad1ad5..5478748f0 100644
--- a/app/generator.js
+++ b/app/generator.js
@@ -90,18 +90,13 @@ export default class Generator extends Base {
 
         this.log('# Client\n');
 
-        this.prompt([{
+        this.prompt([/*{
             type: 'list',
             name: 'script',
             message: 'What would you like to write scripts with?',
-            choices: [ 'JavaScript', 'JavaScript + Babel'],
-            filter: function( val ) {
-              return {
-                'JavaScript': 'js',
-                'JavaScript + Babel': 'babel'
-              }[val];
-            }
-          }, {
+            choices: ['Babel', 'TypeScript'],
+            filter: function(val) { return val.toLowerCase(); }
+          }, */{
             type: 'list',
             name: 'markup',
             message: 'What would you like to write markup with?',
@@ -134,9 +129,8 @@ export default class Generator extends Base {
             }
           }], function (answers) {
 
-            // also set 'js' to true if using babel
-            if(answers.script === 'babel') { this.filters.js = true; }
-            this.filters[answers.script] = true;
+            this.filters.js = true;
+            this.filters.babel = true;
             this.filters[answers.markup] = true;
             this.filters[answers.stylesheet] = true;
             this.filters[answers.router] = true;
diff --git a/app/templates/client/app/account(auth)/account(js).js b/app/templates/client/app/account(auth)/account.js
similarity index 100%
rename from app/templates/client/app/account(auth)/account(js).js
rename to app/templates/client/app/account(auth)/account.js
diff --git a/app/templates/client/app/account(auth)/login/login.controller(js).js b/app/templates/client/app/account(auth)/login/login.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/login/login.controller(js).js
rename to app/templates/client/app/account(auth)/login/login.controller.js
diff --git a/app/templates/client/app/account(auth)/settings/settings.controller(js).js b/app/templates/client/app/account(auth)/settings/settings.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/settings/settings.controller(js).js
rename to app/templates/client/app/account(auth)/settings/settings.controller.js
diff --git a/app/templates/client/app/account(auth)/signup/signup.controller(js).js b/app/templates/client/app/account(auth)/signup/signup.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/signup/signup.controller(js).js
rename to app/templates/client/app/account(auth)/signup/signup.controller.js
diff --git a/app/templates/client/app/admin(auth)/admin.controller(js).js b/app/templates/client/app/admin(auth)/admin.controller.js
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin.controller(js).js
rename to app/templates/client/app/admin(auth)/admin.controller.js
diff --git a/app/templates/client/app/admin(auth)/admin(js).js b/app/templates/client/app/admin(auth)/admin.js
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(js).js
rename to app/templates/client/app/admin(auth)/admin.js
diff --git a/app/templates/client/app/app(js).js b/app/templates/client/app/app.js
similarity index 100%
rename from app/templates/client/app/app(js).js
rename to app/templates/client/app/app.js
diff --git a/app/templates/client/app/main/main.controller(js).js b/app/templates/client/app/main/main.controller.js
similarity index 100%
rename from app/templates/client/app/main/main.controller(js).js
rename to app/templates/client/app/main/main.controller.js
diff --git a/app/templates/client/app/main/main.controller.spec(js).js b/app/templates/client/app/main/main.controller.spec.js
similarity index 100%
rename from app/templates/client/app/main/main.controller.spec(js).js
rename to app/templates/client/app/main/main.controller.spec.js
diff --git a/app/templates/client/app/main/main(js).js b/app/templates/client/app/main/main.js
similarity index 100%
rename from app/templates/client/app/main/main(js).js
rename to app/templates/client/app/main/main.js
diff --git a/app/templates/client/components/auth(auth)/auth.module(js).js b/app/templates/client/components/auth(auth)/auth.module.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/auth.module(js).js
rename to app/templates/client/components/auth(auth)/auth.module.js
diff --git a/app/templates/client/components/auth(auth)/auth.service(js).js b/app/templates/client/components/auth(auth)/auth.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/auth.service(js).js
rename to app/templates/client/components/auth(auth)/auth.service.js
diff --git a/app/templates/client/components/auth(auth)/interceptor.service(js).js b/app/templates/client/components/auth(auth)/interceptor.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/interceptor.service(js).js
rename to app/templates/client/components/auth(auth)/interceptor.service.js
diff --git a/app/templates/client/components/auth(auth)/router.decorator(js).js b/app/templates/client/components/auth(auth)/router.decorator.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/router.decorator(js).js
rename to app/templates/client/components/auth(auth)/router.decorator.js
diff --git a/app/templates/client/components/auth(auth)/user.service(js).js b/app/templates/client/components/auth(auth)/user.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/user.service(js).js
rename to app/templates/client/components/auth(auth)/user.service.js
diff --git a/app/templates/client/components/footer/footer.directive(js).js b/app/templates/client/components/footer/footer.directive.js
similarity index 100%
rename from app/templates/client/components/footer/footer.directive(js).js
rename to app/templates/client/components/footer/footer.directive.js
diff --git a/app/templates/client/components/modal(uibootstrap)/modal.service(js).js b/app/templates/client/components/modal(uibootstrap)/modal.service.js
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal.service(js).js
rename to app/templates/client/components/modal(uibootstrap)/modal.service.js
diff --git a/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js b/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js
similarity index 100%
rename from app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js
rename to app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js
diff --git a/app/templates/client/components/navbar/navbar.controller(js).js b/app/templates/client/components/navbar/navbar.controller.js
similarity index 100%
rename from app/templates/client/components/navbar/navbar.controller(js).js
rename to app/templates/client/components/navbar/navbar.controller.js
diff --git a/app/templates/client/components/navbar/navbar.directive(js).js b/app/templates/client/components/navbar/navbar.directive.js
similarity index 100%
rename from app/templates/client/components/navbar/navbar.directive(js).js
rename to app/templates/client/components/navbar/navbar.directive.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller(js).js
rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec(js).js
rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive(js).js
rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec(js).js
rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js
diff --git a/app/templates/client/components/socket(socketio)/socket.mock(js).js b/app/templates/client/components/socket(socketio)/socket.mock.js
similarity index 100%
rename from app/templates/client/components/socket(socketio)/socket.mock(js).js
rename to app/templates/client/components/socket(socketio)/socket.mock.js
diff --git a/app/templates/client/components/socket(socketio)/socket.service(js).js b/app/templates/client/components/socket(socketio)/socket.service.js
similarity index 100%
rename from app/templates/client/components/socket(socketio)/socket.service(js).js
rename to app/templates/client/components/socket(socketio)/socket.service.js
diff --git a/app/templates/client/components/ui-router(uirouter)/ui-router.mock(js).js b/app/templates/client/components/ui-router(uirouter)/ui-router.mock.js
similarity index 100%
rename from app/templates/client/components/ui-router(uirouter)/ui-router.mock(js).js
rename to app/templates/client/components/ui-router(uirouter)/ui-router.mock.js
diff --git a/test/test-file-creation.js b/test/test-file-creation.js
index 5edd9ec84..26f326dc7 100644
--- a/test/test-file-creation.js
+++ b/test/test-file-creation.js
@@ -729,66 +729,5 @@ describe('angular-fullstack generator', function () {
       }
 
     });
-
-    describe('with no preprocessors and no server options', function() {
-      var testOptions = {
-        script: 'js',
-        markup: 'html',
-        stylesheet: 'css',
-        router: 'ngroute',
-        testing: 'jasmine',
-        odms: [],
-        auth: false,
-        oauth: [],
-        socketio: false,
-        bootstrap: true,
-        uibootstrap: true
-      };
-
-      beforeEach(function(done) {
-        helpers.mockPrompt(gen, testOptions);
-        done();
-      });
-
-      it('should run client tests successfully', function(done) {
-        runTest('grunt test:client', this, done);
-      });
-
-      it('should pass jscs', function(done) {
-        runTest('grunt jscs', this, done);
-      });
-
-      it('should pass lint', function(done) {
-        runTest('grunt jshint', this, done);
-      });
-
-      it('should run server tests successfully', function(done) {
-        runTest('grunt test:server', this, done);
-      });
-
-      it('should generate expected files', function (done) {
-        gen.run(function () {
-          assert.file(genFiles(testOptions));
-          done();
-        });
-      });
-
-      it('should not generate unexpected files', function (done) {
-        gen.run(function () {
-          assertOnlyFiles(genFiles(testOptions), done);
-        });
-      });
-
-      if(!process.env.SKIP_E2E) {
-        it('should run e2e tests successfully', function (done) {
-          runTest('grunt test:e2e', this, done, 240000);
-        });
-
-        //it('should run e2e tests successfully for production app', function (done) {
-        //  runTest('grunt test:e2e:prod', this, done, 240000);
-        //});
-      }
-
-    });
   });
 });