Merge pull request #19 from vaadin/rename_components

Rename components to Elements

11 files changed, 108 insertions, 98 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 2d0e1f3..97ba651 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+## Vaadin Elements 0.3.0-beta11 (2015-10-20)
+- Vaadin Components has been renamed to Vaadin Elements.
+- `<vaadin-grid>` updated to 0.9.0-beta4.
+
 ## Vaadin Components 0.3.0-beta10 (2015-10-09)
 - `<vaadin-grid>` updated to 0.9.0-beta3.
 
diff --git a/README.md b/README.md
index 078ffb1..34da3c7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Vaadin Components
+# Vaadin Elements
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vaadin/vaadin-components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) or [discuss on the vaadin.com forum](https://vaadin.com/forum/#!/category/9848927/)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vaadin/vaadin-elements?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) or [discuss on the vaadin.com forum](https://vaadin.com/forum/#!/category/9848927/)
 
-Vaadin Components is an evolving set of custom HTML elements, built using [Polymer](https://www.polymer-project.org), for building mobile and desktop web applications in modern browsers.
+Vaadin Elements is an evolving set of custom HTML elements, built using [Polymer](https://www.polymer-project.org), for building mobile and desktop web applications in modern browsers.
 
 ### Component examples and documentation
 
@@ -10,7 +10,7 @@ View live examples and source code side-by-side for individual custom elements.
 
 | Component | Description |
 | --- | --- |
-| [<**vaadin-grid**>](https://github.com/vaadin/vaadin-grid) &middot; [Examples](https://cdn.vaadin.com/vaadin-components/latest/vaadin-grid/demo/) &middot; [API](https://cdn.vaadin.com/vaadin-components/latest/vaadin-components/apidoc/#vaadin-grid) | Data grid for showing large amounts of tabular data. |
+| [<**vaadin-grid**>](https://github.com/vaadin/vaadin-grid) &middot; [Examples](https://cdn.vaadin.com/vaadin-elements/latest/vaadin-grid/demo/) &middot; [API](https://cdn.vaadin.com/vaadin-elements/latest/vaadin-elements/apidoc/#vaadin-grid) | Data grid for showing large amounts of tabular data. |
 
 
 ### Quickstart
@@ -23,7 +23,7 @@ View live examples and source code side-by-side for individual custom elements.
 
 ### Installation
 
-We offer three ways to use Vaadin Components in your project: Bower, CDN and ZIP archive. The only difference between the options is the URL you use to import the necessary files into your HTML page.
+We offer three ways to use Vaadin Elements in your project: Bower, CDN and ZIP archive. The only difference between the options is the URL you use to import the necessary files into your HTML page.
 
 #### 1. Create a new folder for your project
 
@@ -32,17 +32,17 @@ We offer three ways to use Vaadin Components in your project: Bower, CDN and ZIP
  $ cd my-project
  ```
 
-#### 2. Install Vaadin Components
+#### 2. Install Vaadin Elements
 
 - ##### Bower
 
  We recommend using [Bower](http://bower.io) for managing your front-end dependencies. Follow the [Bower installation instructions](http://bower.io/#install-bower), then run the following command inside your project folder to install the most recent stable release.
 
  ```shell
- $ bower install --save vaadin-components
+ $ bower install --save vaadin-elements
  ```
 
- This will download Vaadin Components and its dependencies to the `bower_components` folder inside your project's folder.
+ This will download Vaadin Elements and its dependencies to the `bower_components` folder inside your project's folder.
  
  If you wish to use the development snapshot version of some component, you can install/update that separately:
  
@@ -52,27 +52,27 @@ We offer three ways to use Vaadin Components in your project: Bower, CDN and ZIP
 
 - ##### CDN
 
- You can use Vaadin Components from CDN (see example below). This is especially convenient for services like JSFiddle, Codepen.io, etc.
+ You can use Vaadin Elements from CDN (see example below). This is especially convenient for services like JSFiddle, Codepen.io, etc.
 
  For example, to import vaadin-grid, use the following URL:
 
-   `https://cdn.vaadin.com/vaadin-components/latest/vaadin-grid/vaadin-grid.html`
+   `https://cdn.vaadin.com/vaadin-elements/latest/vaadin-grid/vaadin-grid.html`
 
- To import all Vaadin Components, use the following URL:
+ To import all Vaadin Elements, use the following URL:
 
-   `https://cdn.vaadin.com/vaadin-components/latest/vaadin-components/vaadin-components.html`
+   `https://cdn.vaadin.com/vaadin-elements/latest/vaadin-elements/vaadin-elements.html`
 
- > You can also use the nightly snapshot versions of any component, e.g. https://cdn.vaadin.com/vaadin-components/master/vaadin-grid/vaadin-grid.html
+ > You can also use the nightly snapshot versions of any component, e.g. https://cdn.vaadin.com/vaadin-elements/master/vaadin-grid/vaadin-grid.html
 
 
 - ##### Download ZIP
 
- 1. Download the latest ZIP archive from [vaadin.com/download](https://vaadin.com/download#components)
+ 1. Download the latest ZIP archive from [vaadin.com/download](https://vaadin.com/download#elements)
  2. Extract the archive under your project folder, for example `deps`
 
 #### 3. Create a HTML file
 
- Create a new HTML file inside your project folder and copy the following code into it (choose one of the options how to import Vaadin Components in the `<head>` section):
+ Create a new HTML file inside your project folder and copy the following code into it (choose one of the options how to import Vaadin Elements in the `<head>` section):
 
  > **Serving the files during development**, when using Bower or the ZIP archive:
 
@@ -82,19 +82,19 @@ We offer three ways to use Vaadin Components in your project: Bower, CDN and ZIP
 <!doctype html>
 <html>
   <head>
-    <!-- Import Web Component polyfills and all Vaadin Components -->
+    <!-- Import Web Component polyfills and all Vaadin Elements -->
 
     <!-- CDN -->
-    <script src="https://cdn.vaadin.com/vaadin-components/latest/webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link href="https://cdn.vaadin.com/vaadin-components/latest/vaadin-components/vaadin-components.html" rel="import">
+    <script src="https://cdn.vaadin.com/vaadin-elements/latest/webcomponentsjs/webcomponents-lite.min.js"></script>
+    <link href="https://cdn.vaadin.com/vaadin-elements/latest/vaadin-elements/vaadin-elements.html" rel="import">
 
     <!-- Bower -->
     <!-- <script src="bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link href="bower_components/vaadin-components/vaadin-components.html" rel="import"> -->
+    <link href="bower_components/vaadin-components/vaadin-elements.html" rel="import"> -->
 
     <!-- ZIP archive -->
     <!-- <script src="deps/webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link href="deps/vaadin-components/vaadin-components.html" rel="import"> -->
+    <link href="deps/vaadin-elements/vaadin-elements.html" rel="import"> -->
   </head>
   <body>
 
diff --git a/bower.json b/bower.json
index 724583f..3a0d0e5 100644
--- a/bower.json
+++ b/bower.json
@@ -1,15 +1,15 @@
 {
-  "name": "vaadin-components",
+  "name": "vaadin-elements",
   "version": "0.3.0-snapshot",
   "authors": [
     "Vaadin Ltd"
   ],
-  "description": "Vaadin Components is an evolving set of custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.",
+  "description": "Vaadin Elements is an evolving set of custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.",
   "license": "Apache License 2.0",
   "keywords": [
     "web-components"
   ],
-  "main": "vaadin-components.html",
+  "main": "vaadin-elements.html",
   "ignore": [
     "**/.*",
     "**/node_modules",
@@ -18,7 +18,8 @@
     "**/tests"
   ],
   "dependencies": {
-    "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta3"
+    "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta4",
+    "elements-demo-resources": "vaadin/elements-demo-resources#master"
   },
   "devDependencies": {
     "iron-doc-viewer": "polymerelements/iron-doc-viewer#~1.0.3",
diff --git a/demo/index.html b/demo/index.html
index cdc8b74..1729e44 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <html>
 <head>
-  <title>Vaadin Components Code Examples</title>
+  <title>Vaadin Elements Code Examples</title>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <script src="../../marked/lib/marked.js"></script>
 
   <script src="../../code-example/vendor/prismjs/prism.js"></script>
   <link rel="stylesheet" href="../../code-example/vendor/prismjs/prism.css">
-  <link rel="stylesheet" href="../../components-demo-resources/demo.css">
+  <link rel="stylesheet" href="../../elements-demo-resources/demo.css">
 
   <script src="../ga.js"></script>
   <style type="text/css">
diff --git a/ga.js b/ga.js
index 8439f09..51577de 100644
--- a/ga.js
+++ b/ga.js
@@ -1,4 +1,4 @@
-// Analytics for Vaadin Components
+// Analytics for Vaadin Elements
 
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -10,7 +10,7 @@ ga('create', 'UA-658457-6', 'auto');
 function locationHashChanged() {
   if(/vaadin/.test(window.location.hostname)) {
     var pageViewUrl = (window.location.pathname + window.location.hash)
-      .replace(/vaadin-components\/latest\/(.+)\/demo/, 'components-examples/$1')
+      .replace(/vaadin-elements\/latest\/(.+)\/demo/, 'components-examples/$1')
       .replace('#', '/');
     ga('send', 'pageview', pageViewUrl)
   }
diff --git a/package.json b/package.json
index 682742a..5ff849a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "vaadin-components",
+  "name": "vaadin-elements",
   "version": "0.3.0",
   "description": "A set of high-quality Web Components with a customizable Sass based theme",
   "author": "Vaadin Ltd",
@@ -38,7 +38,7 @@
   },
   "keywords": [
     "vaadin",
-    "components",
+    "elements",
     "web",
     "components",
     "webcomponents",
diff --git a/tasks/cdn.js b/tasks/cdn.js
index d1a8526..9ff994a 100644
--- a/tasks/cdn.js
+++ b/tasks/cdn.js
@@ -5,6 +5,7 @@ var gulp = require('gulp');
 var fs = require('fs-extra');
 var markdown = require('gulp-markdown');
 var replace = require('gulp-replace');
+var modify = require('gulp-modify');
 var rsync = require('gulp-rsync');
 var gutil = require('gulp-util');
 var _ = require('lodash');
@@ -31,14 +32,22 @@ gulp.task('cdn:stage-bower_components', function() {
   });
 });
 
-gulp.task('cdn:stage-vaadin-components', function() {
-  return gulp.src(['LICENSE.html', 'ga.js', 'vaadin-components.html', 'demo/*', 'apidoc/*'], {base:"."})
-    .pipe(replace('https://cdn.vaadin.com/vaadin-components/latest/', '../../'))
-    .pipe(addsrc('README.md'))
-    .pipe(gulp.dest(stagingPath + "/vaadin-components"));
+gulp.task('cdn:stage-vaadin-elements', function() {
+  return gulp.src(['LICENSE.html', 'README.md', 'ga.js', 'vaadin-elements.html', 'demo/*', 'apidoc/*'], {base:"."})
+    .pipe(modify({
+        fileModifier: function(file, contents) {
+          if (/README.md/.test(file.path)) {
+            contents = contents.replace(/\/latest\//mg, '/' + version + '/')
+          } else {
+            contents.replace('https://cdn.vaadin.com/vaadin-elements/latest/', '../../');
+          }
+          return contents;
+        }
+      }))
+    .pipe(gulp.dest(stagingPath + "/vaadin-elements"));
 });
 
-gulp.task('stage:cdn', [ 'clean:cdn', 'cdn:stage-bower_components', 'cdn:stage-vaadin-components' ]);
+gulp.task('stage:cdn', [ 'clean:cdn', 'cdn:stage-bower_components', 'cdn:stage-vaadin-elements' ]);
 
 gulp.task('upload:cdn', ['stage:cdn'], function() {
   common.checkArguments(['cdnUsername', 'cdnDestination']);
@@ -60,17 +69,7 @@ gulp.task('deploy:cdn', ['upload:cdn'], function(done) {
   if (permalink) {
     var cmd = 'rm -f ' + args.cdnDestination + permalink + '; ln -s ' + version + ' ' +  args.cdnDestination + permalink + '; ls -l ' + args.cdnDestination;
     gutil.log('Deploying CDN : ssh ' + args.cdnUsername + '@' + host + ' ' +  cmd);
-    require('node-ssh-exec')({
-      host: host,
-      username: args.cdnUsername,
-      privateKey: config.paths.privateKey()
-    }, cmd, function (error, response) {
-      if (error) {
-        throw error;
-      }
-      gutil.log(response);
-      done();
-    });
+    common.ssh(args.cdnUsername, host, cmd, done);
   } else {
     done();
   }
@@ -87,13 +86,13 @@ gulp.task('cdn-test:install-dependencies', function() {
   }, [['web-component-tester#2.2.6']]);
 });
 
-config.components.forEach(function (n) {
+config.elements.forEach(function (n) {
   gulp.task('cdn-test:stage:' + n, ['cdn-test:clean', 'cdn-test:install-dependencies'], function(done) {
     fs.mkdirsSync(testPath);
     return git.clone('https://github.com/vaadin/' + n, {cwd: testPath}, function (err) {
       gulp.src(testPath + '/' + n + '/test/**')
-        .pipe(replace(/(src|href)=("|')(.*?)\.\.\/\.\.\/(bower_components|node_modules)\/(.*?)\//mg, '$1=$2https://cdn.vaadin.com/vaadin-components/'+ version + '/$5/'))
-        .pipe(replace(/(src|href)=("|')(.*?)\.\.\//mg, '$1=$2https://cdn.vaadin.com/vaadin-components/'+ version +'/' + n + '/'))
+        .pipe(replace(/(src|href)=("|')(.*?)\.\.\/\.\.\/(bower_components|node_modules)\/(.*?)\//mg, '$1=$2https://cdn.vaadin.com/vaadin-elements/'+ version + '/$5/'))
+        .pipe(replace(/(src|href)=("|')(.*?)\.\.\//mg, '$1=$2https://cdn.vaadin.com/vaadin-elements/'+ version +'/' + n + '/'))
         .pipe(replace(/(src|href)=("|')(.*?)(web-component-tester)\//mg, '$1=$2../../web-component-tester/'))
         .pipe(gulp.dest(testPath + '/' + n + '/test/'));
       done();
@@ -101,7 +100,7 @@ config.components.forEach(function (n) {
   });
 });
 
-gulp.task('cdn-test:stage', _.map(config.components, function (n) {
+gulp.task('cdn-test:stage', _.map(config.elements, function (n) {
     return 'cdn-test:stage:' + n;
 }));
 
@@ -115,7 +114,7 @@ gulp.task('verify:cdn', ['cdn-test:stage'], function(done) {
   common.testSauce(
     ['target/cdn/' + version + '/test/**/index.html'],
     ['Windows 7/firefox@36'],
-    'vaadin-components / cdn.vaadin.com / ' + version,
+    'vaadin-elements / cdn.vaadin.com / ' + version,
     function(err) {
       common.autoRevert(err, function() {
         gutil.log('Deleting folder ' + args.cdnDestination + version);
diff --git a/tasks/common.js b/tasks/common.js
index d4ba658..316d245 100644
--- a/tasks/common.js
+++ b/tasks/common.js
@@ -3,6 +3,7 @@ var chalk = require('chalk');
 var wct = require('web-component-tester').test;
 var _ = require('lodash');
 var gutil = require('gulp-util');
+var config = require('./config');
 
 function cleanDone(done) {
   return function(error) {
@@ -40,9 +41,19 @@ function test(options, done) {
   wct(options, cleanDone(done));
 }
 
+function ssh(user, host, command, done) {
+  gutil.log('SSH: ' + host + ' -> ' + command);
+  require('node-ssh-exec')({
+      host: host,
+      username: user,
+      privateKey: config.paths.privateKey()
+    }, command, done);
+}
+
 module.exports = {
   localAddress: localAddress,
   test: test,
+  ssh: ssh,
   checkArguments: checkArguments,
 
   testSauce: function(suites, browsers, build, done) {
diff --git a/tasks/config.js b/tasks/config.js
index 83560f0..3b618ea 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -4,7 +4,7 @@ var fs = require('fs');
 var userhome = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
 
 module.exports = {
-  components: ['vaadin-grid'],
+  elements: ['vaadin-grid'],
   version: args.version || 'master',
   permalink: args.version ? 'latest' : '',
   toolsHost: args.toolsHostname || 'tools.vaadin.com',
diff --git a/tasks/docsite.js b/tasks/docsite.js
index b5f9cad..2526f8d 100644
--- a/tasks/docsite.js
+++ b/tasks/docsite.js
@@ -41,22 +41,22 @@ gulp.task('cdn:docsite:bower_components', ['cdn:stage-bower_components'], functi
     .pipe(gulp.dest(docPath + '/bower_components'));
 });
 
-gulp.task('cdn:docsite:components', function() {
+gulp.task('cdn:docsite:elements', function() {
   return gulp.src('doc/*')
     .pipe(gulp.dest(docPath));
 });
 
-var doctasks = ['cdn:docsite:components'];
-config.components.forEach(function (n) {
+var doctasks = ['cdn:docsite:elements'];
+config.elements.forEach(function (n) {
   var task = 'cdn:docsite:' + n;
   doctasks.push(task);
   gulp.task(task, ['cdn:docsite:bower_components'], function(done) {
-    var componentDocsite = docPath + '/' + n;
-    var componentDemo = stagingPath + '/' + n + '/demo/**';
+    var elementDocsite = docPath + '/' + n;
+    var elementDemo = stagingPath + '/' + n + '/demo/**';
 
-    gutil.log('Generating site documentation from '  + componentDemo + ' into ' + componentDocsite);
-    fs.mkdirsSync(componentDocsite);
-    return gulp.src([componentDemo, '!**/*-embed.html'])
+    gutil.log('Generating site documentation from '  + elementDemo + ' into ' + elementDocsite);
+    fs.mkdirsSync(elementDocsite);
+    return gulp.src([elementDemo, '!**/*-embed.html'])
       // Remove bad tags
       .pipe(replace(/^.*<(!doctype|\/?html|\/?head|\/?body|meta|title).*>.*\n/img, ''))
       // Uncomment metainfo, and enclose all the example in {% raw %} ... {% endraw %} to avoid liquid conflicts
@@ -78,7 +78,7 @@ config.components.forEach(function (n) {
       // Remove webcomponents polyfill since it's added at top of the site
       .pipe(replace(/^.*<script.*?\/webcomponents.*\.js[\"'].*?<\/script>\s*?\n?/img, ''))
       // embed files are displayed as iframe, we don't remove above fragments like body or polyfill
-      .pipe(addsrc(componentDemo + '/*-embed.html'))
+      .pipe(addsrc(elementDemo + '/*-embed.html'))
       // Remove Analytics
       .pipe(replace(/^.*<script.*?ga\.js[\"'].*?<\/script>\s*?\n?/img, ''))
       // Adjust bowerComponents variable in common.html
@@ -91,7 +91,7 @@ config.components.forEach(function (n) {
       .pipe(replace(/^.*<link.*demo.css.*\n/im, ''))
       // Remove table of contents
       .pipe(replace(/^.*table-of-contents.html.*\n/im, ''))
-      .pipe(gulp.dest(componentDocsite));
+      .pipe(gulp.dest(elementDocsite));
   });
 });
 
diff --git a/tasks/zip.js b/tasks/zip.js
index f649d98..2900275 100644
--- a/tasks/zip.js
+++ b/tasks/zip.js
@@ -14,10 +14,10 @@ var zip = require('gulp-zip');
 var stagingPath = config.paths.staging.zip;
 var version = config.version;
 var host = config.zipHost;
-var filename = 'vaadin-components-' + version + '.zip';
+var user = args.zipUsername;
+var filename = 'vaadin-elements-' + version + '.zip';
 var majorMinorVersion = version.replace(/(\d+\.\d+)(\.|-)(.*)/, '$1');
 
-
 gulp.task('clean:zip', function() {
   fs.removeSync(stagingPath);
 });
@@ -28,44 +28,40 @@ gulp.task('stage:zip', ['clean:zip', 'stage:cdn'], function() {
     .pipe(gulp.dest(stagingPath));
 });
 
-gulp.task('zip:upload', ['stage:zip'], function(done) {
+function computeDestination() {
   common.checkArguments(['zipUsername', 'zipDestination']);
-  var path = args.zipDestination + majorMinorVersion + '/' + version + '/' + filename;
-
-  gutil.log('Uploading zip package (scp): ' + stagingPath + '/' + filename + ' -> ' + args.zipUsername + '@' + host + ':' + path);
+  var path = majorMinorVersion != version ? majorMinorVersion + '/' + version : version;
+  path = args.zipDestination + path + '/' + filename;
+  return path;
+}
 
-  require('scp2').scp(stagingPath + '/' + filename, {
+gulp.task('zip:upload', ['stage:zip'], function(done) {
+  done();
+  return;
+  var src = stagingPath + '/' + filename;
+  var dst = computeDestination();
+  gutil.log('Uploading zip package (scp): ' + src + ' -> ' + user + '@' + host + ':' + dst);
+  require('scp2').scp(src, {
     host: host,
-    username: args.zipUsername,
+    username: user,
     privateKey: config.paths.privateKey(),
-    path: path
+    path: dst
   }, function(err) {
     done(err);
   })
 });
 
-function ssh(command, done) {
-  gutil.log('SSH: ' + host + ' -> ' + command);
-
-  require('node-ssh-exec')({
-      host: host,
-      username: args.zipUsername,
-      privateKey: config.paths.privateKey()
-    }, command,
-    function (err) {
-      done(err);
-    });
-}
-
 gulp.task('zip:update-references', ['zip:upload'], function(done) {
-  common.checkArguments(['zipUsername', 'zipDestination']);
-
+  var dst = computeDestination();
+  var latest = '/var/www/vaadin/download/elements/latest/vaadin-elements-latest.zip';
+  var cmd = 'rm -f ' + latest + '; ln -s ' + dst + ' ' + latest;
+  common.ssh(user, host, cmd);
   if(args.release) {
-    ssh("sed -i '1i components/" + majorMinorVersion + '/' + version + "' " + args.zipDestination + 'VERSIONS', done);
+    common.ssh(user, host, "sed -i '1i elements/" + majorMinorVersion + '/' + version + "' " + args.zipDestination + 'VERSIONS', done);
   } else if(args.preRelease) {
-    ssh("sed -i '1i components/" + majorMinorVersion + '/' + version + "' " + args.zipDestination + 'PRERELEASES', done);
+    common.ssh(user, host, "sed -i '1i elements/" + majorMinorVersion + '/' + version + "' " + args.zipDestination + 'PRERELEASES', done);
   } else {
-    ssh('echo components/' + majorMinorVersion + '/' + version + ' > ' + args.zipDestination + 'SNAPSHOT', done);
+    common.ssh(user, host, 'echo elements/' + majorMinorVersion + '/' + version + ' > ' + args.zipDestination + 'SNAPSHOT', done);
   }
 });
 
@@ -76,7 +72,7 @@ gulp.task('zip-test:clean', function() {
 });
 
 gulp.task('zip-test:download', ['zip-test:clean'],  function() {
-  var url = args.zipUrl || 'https://vaadin.com/download/components';
+  var url = args.zipUrl || 'https://vaadin.com/download/elements';
   return download(url + '/' + majorMinorVersion +'/' + version + '/' + filename)
     .pipe(gulp.dest(stagingPath + '/test'));
 });
@@ -97,9 +93,9 @@ gulp.task('zip-test:install-wct', ['zip-test:download'], function() {
 
 // TODO: Haven't been fixed for the new project structure. Once the tests are in use,
 // apply similar changes as in cdn.js
-config.components.forEach(function (n) {
+config.elements.forEach(function (n) {
   gulp.task('zip-test:stage:' + n, ['zip-test:download'], function() {
-    return gulp.src('vaadin-components/' + n + '/test/**/*')
+    return gulp.src('vaadin-elements/' + n + '/test/**/*')
       .pipe(replace(/(src|href)=("|')(.*?)\.\.\/\.\.\/\.\.\/\.\.\/(bower_components|node_modules)\//mg, '$1=$2../../$3'))
       .pipe(replace(/(src|href)=("|')(.*?)\.\.\/\.\.\/\.\.\/(bower_components|node_modules)\//mg, '$1=$2../../$3'))
       .pipe(replace(/(src|href)=("|')(.*?)\.\.\/(vaadin-)/mg, '$1=$2../../' + n + '/$3$4'))
@@ -107,7 +103,7 @@ config.components.forEach(function (n) {
   });
 });
 
-gulp.task('zip-test:stage', _.map(config.components, function(n) {
+gulp.task('zip-test:stage', _.map(config.elements, function(n) {
     return 'zip-test:stage:'+n;
 }));
 
@@ -119,7 +115,7 @@ gulp.task('verify:zip', ['zip-test:unzip', 'zip-test:install-wct', 'zip-test:sta
   common.testSauce(
     ['target/zip/test/test/**/index.html'],
     ['Windows 7/internet explorer@11'],
-    'vaadin-components / vaadin.com / ' + version,
+    'vaadin-elements / vaadin.com / ' + version,
     function(err) {
       common.autoRevert(err, function() {
         var path = args.zipDestination + majorMinorVersion + '/' + version;
@@ -127,12 +123,11 @@ gulp.task('verify:zip', ['zip-test:unzip', 'zip-test:install-wct', 'zip-test:sta
         gutil.log('Deleting package ' + path);
 
         // remove the version from VERSIONS
-        ssh('grep -v "components/' + majorMinorVersion + '/' + version + '" ' +
+        common.ssh(user, host, 'grep -v "elements/' + majorMinorVersion + '/' + version + '" ' +
           args.zipDestination + 'VERSIONS > temp && mv temp ' + args.zipDestination + 'VERSIONS', function(error) {
           if(error) done(error);
-
           // remove the package
-          ssh('rm -rf ' + path, done);
+          common.ssh(user, host, 'rm -rf ' + path, done);
         });
         }, done);
       });