diff --git a/createlinks b/createlinks
index 1369632..16c604a 100644
--- a/createlinks
+++ b/createlinks
@@ -2,38 +2,38 @@
 
 use esmith::Build::CreateLinks qw(:all);
 
-templates2events("/etc/ajaxplorer/bootstrap_plugins.php", qw(webapps-update bootstrap-console-save));
-templates2events("/var/cache/ajaxplorer/diag_result.php", qw(webapps-update bootstrap-console-save));
-templates2events("/var/cache/ajaxplorer/first_run_passed", qw(webapps-update bootstrap-console-save));
-templates2events("/var/cache/ajaxplorer/admin_counted", qw(webapps-update bootstrap-console-save));
-templates2events("/etc/e-smith/sql/init/ajaxplorer", qw(webapps-update bootstrap-console-save));
-templates2events("/etc/ajaxplorer/bootstrap_repositories.php", qw(webapps-update bootstrap-console-save share-create share-delete share-modify share-modify-servers));
-templates2events("/var/lib/ajaxplorer/plugins/auth.serial/roles.ser", qw(webapps-update bootstrap-console-save share-create share-delete share-modify share-modify-servers));
-templates2events("/var/lib/ajaxplorer/plugins/auth.serial/users.ser", qw(webapps-update bootstrap-console-save user-create user-delete));
-templates2events("/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser", qw(webapps-update bootstrap-console-save));
-templates2events("/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json", qw(webapps-update bootstrap-console-save));
+templates2events("/etc/pydio/bootstrap_plugins.php", qw(webapps-update bootstrap-console-save));
+templates2events("/var/cache/pydio/diag_result.php", qw(webapps-update bootstrap-console-save));
+templates2events("/var/cache/pydio/first_run_passed", qw(webapps-update bootstrap-console-save));
+templates2events("/var/cache/pydio/admin_counted", qw(webapps-update bootstrap-console-save));
+templates2events("/etc/e-smith/sql/init/pydio", qw(webapps-update bootstrap-console-save));
+templates2events("/etc/pydio/bootstrap_repositories.php", qw(webapps-update bootstrap-console-save share-create share-delete share-modify share-modify-servers));
+templates2events("/var/lib/pydio/plugins/auth.serial/roles.ser", qw(webapps-update bootstrap-console-save share-create share-delete share-modify share-modify-servers));
+templates2events("/var/lib/pydio/plugins/auth.serial/users.ser", qw(webapps-update bootstrap-console-save user-create user-delete));
+templates2events("/var/lib/pydio/plugins/conf.serial/plugins_configs.ser", qw(webapps-update bootstrap-console-save));
+templates2events("/var/lib/pydio/plugins/boot.conf/bootstrap.json", qw(webapps-update bootstrap-console-save));
 
-safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_plugins.php/template-begin");
-safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/template-begin");
-safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_plugins.php/template-end");
-safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/template-end");
-safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/cache/ajaxplorer/diag_result.php/template-begin");
-safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/var/cache/ajaxplorer/diag_result.php/template-end");
-safe_touch("root/etc/e-smith/templates/var/cache/ajaxplorer/first_run_passed/template-begin");
-safe_touch("root/etc/e-smith/templates/var/cache/ajaxplorer/admin_counted/template-begin");
+safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/pydio/bootstrap_plugins.php/template-begin");
+safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/template-begin");
+safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/pydio/bootstrap_plugins.php/template-end");
+safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/template-end");
+safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/cache/pydio/diag_result.php/template-begin");
+safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/var/cache/pydio/diag_result.php/template-end");
+safe_touch("root/etc/e-smith/templates/var/cache/pydio/first_run_passed/template-begin");
+safe_touch("root/etc/e-smith/templates/var/cache/pydio/admin_counted/template-begin");
 
-event_link("ajaxplorer-user-rights", "webapps-update", "85");
-event_link("ajaxplorer-user-rights", "share-create", "85");
-event_link("ajaxplorer-user-rights", "share-delete", "85");
-event_link("ajaxplorer-user-rights", "share-modify", "85");
-event_link("ajaxplorer-user-rights", "share-modify-servers", "85");
-event_link("ajaxplorer-user-rights", "user-delete", "85");
-event_link("ajaxplorer-user-rights", "group-create", "85");
-event_link("ajaxplorer-user-rights", "group-modify", "85");
-event_link("ajaxplorer-user-rights", "group-delete", "85");
-event_link("ajaxplorer-user-rights", "user-modify-admin", "85");
+event_link("pydio-user-rights", "webapps-update", "85");
+event_link("pydio-user-rights", "share-create", "85");
+event_link("pydio-user-rights", "share-delete", "85");
+event_link("pydio-user-rights", "share-modify", "85");
+event_link("pydio-user-rights", "share-modify-servers", "85");
+event_link("pydio-user-rights", "user-delete", "85");
+event_link("pydio-user-rights", "group-create", "85");
+event_link("pydio-user-rights", "group-modify", "85");
+event_link("pydio-user-rights", "group-delete", "85");
+event_link("pydio-user-rights", "user-modify-admin", "85");
 
-safe_touch("root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/roles.ser/template-begin");
-safe_touch("root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/users.ser/template-begin");
-safe_touch("root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser/template-begin");
-safe_touch("root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/template-begin");
+safe_touch("root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/roles.ser/template-begin");
+safe_touch("root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/users.ser/template-begin");
+safe_touch("root/etc/e-smith/templates/var/lib/pydio/plugins/conf.serial/plugins_configs.ser/template-begin");
+safe_touch("root/etc/e-smith/templates/var/lib/pydio/plugins/boot.conf/bootstrap.json/template-begin");
diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/DbName b/root/etc/e-smith/db/configuration/defaults/pydio/DbName
similarity index 100%
rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/DbName
rename to root/etc/e-smith/db/configuration/defaults/pydio/DbName
diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/DbUser b/root/etc/e-smith/db/configuration/defaults/pydio/DbUser
similarity index 100%
rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/DbUser
rename to root/etc/e-smith/db/configuration/defaults/pydio/DbUser
diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/access b/root/etc/e-smith/db/configuration/defaults/pydio/access
similarity index 100%
rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/access
rename to root/etc/e-smith/db/configuration/defaults/pydio/access
diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/status b/root/etc/e-smith/db/configuration/defaults/pydio/status
similarity index 100%
rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/status
rename to root/etc/e-smith/db/configuration/defaults/pydio/status
diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/type b/root/etc/e-smith/db/configuration/defaults/pydio/type
similarity index 100%
rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/type
rename to root/etc/e-smith/db/configuration/defaults/pydio/type
diff --git a/root/etc/e-smith/db/configuration/migrate/ajaxplorer-database b/root/etc/e-smith/db/configuration/migrate/pydio-database
similarity index 88%
rename from root/etc/e-smith/db/configuration/migrate/ajaxplorer-database
rename to root/etc/e-smith/db/configuration/migrate/pydio-database
index 3744447..c5550a3 100644
--- a/root/etc/e-smith/db/configuration/migrate/ajaxplorer-database
+++ b/root/etc/e-smith/db/configuration/migrate/pydio-database
@@ -1,6 +1,6 @@
 {
-    my $rec = $DB->get('ajaxplorer')
-        || $DB->new_record('ajaxplorer', {type => 'webapp'});
+    my $rec = $DB->get('pydio')
+        || $DB->new_record('pydio', {type => 'webapp'});
     my $pw = $rec->prop('DbPassword');
     if (not $pw or length($pw) < 57){
         use MIME::Base64 qw(encode_base64);
diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/ajaxplorer b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/pydio
similarity index 100%
rename from root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/ajaxplorer
rename to root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/pydio
diff --git a/root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/__user__/rights.ser b/root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/__user__/rights.ser
similarity index 100%
rename from root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/__user__/rights.ser
rename to root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/__user__/rights.ser
diff --git a/root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/roles.ser b/root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/roles.ser
similarity index 100%
rename from root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/roles.ser
rename to root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/roles.ser
diff --git a/root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/users.ser b/root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/users.ser
similarity index 100%
rename from root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/auth.serial/users.ser
rename to root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/auth.serial/users.ser
diff --git a/root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json b/root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/boot.conf/bootstrap.json
similarity index 100%
rename from root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json
rename to root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/boot.conf/bootstrap.json
diff --git a/root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser b/root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/conf.serial/plugins_configs.ser
similarity index 100%
rename from root/etc/e-smith/templates.metadata/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser
rename to root/etc/e-smith/templates.metadata/var/lib/pydio/plugins/conf.serial/plugins_configs.ser
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/ajaxplorer b/root/etc/e-smith/templates/etc/e-smith/sql/init/pydio
similarity index 100%
rename from root/etc/e-smith/templates/etc/e-smith/sql/init/ajaxplorer
rename to root/etc/e-smith/templates/etc/e-smith/sql/init/pydio
diff --git a/root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/001exec b/root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/001exec
similarity index 100%
rename from root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/001exec
rename to root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/001exec
diff --git a/root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/050repo b/root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/050repo
similarity index 100%
rename from root/etc/e-smith/templates/etc/ajaxplorer/bootstrap_repositories.php/050repo
rename to root/etc/e-smith/templates/etc/pydio/bootstrap_repositories.php/050repo
diff --git a/root/etc/e-smith/templates/var/cache/ajaxplorer/admin_counted/true b/root/etc/e-smith/templates/var/cache/pydio/admin_counted/true
similarity index 100%
rename from root/etc/e-smith/templates/var/cache/ajaxplorer/admin_counted/true
rename to root/etc/e-smith/templates/var/cache/pydio/admin_counted/true
diff --git a/root/etc/e-smith/templates/var/cache/ajaxplorer/first_run_passed/true b/root/etc/e-smith/templates/var/cache/pydio/first_run_passed/true
similarity index 100%
rename from root/etc/e-smith/templates/var/cache/ajaxplorer/first_run_passed/true
rename to root/etc/e-smith/templates/var/cache/pydio/first_run_passed/true
diff --git a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/roles.ser/10All b/root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/roles.ser/10All
similarity index 100%
rename from root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/roles.ser/10All
rename to root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/roles.ser/10All
diff --git a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/users.ser/10All b/root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/users.ser/10All
similarity index 100%
rename from root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/auth.serial/users.ser/10All
rename to root/etc/e-smith/templates/var/lib/pydio/plugins/auth.serial/users.ser/10All
diff --git a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All b/root/etc/e-smith/templates/var/lib/pydio/plugins/boot.conf/bootstrap.json/10All
similarity index 100%
rename from root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All
rename to root/etc/e-smith/templates/var/lib/pydio/plugins/boot.conf/bootstrap.json/10All
diff --git a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser/10All b/root/etc/e-smith/templates/var/lib/pydio/plugins/conf.serial/plugins_configs.ser/10All
similarity index 100%
rename from root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/conf.serial/plugins_configs.ser/10All
rename to root/etc/e-smith/templates/var/lib/pydio/plugins/conf.serial/plugins_configs.ser/10All