diff --git a/root/etc/cron.daily/ajaxplorer-tmpwatch b/root/etc/cron.daily/ajaxplorer-tmpwatch
deleted file mode 100644
index 43a3d45..0000000
--- a/root/etc/cron.daily/ajaxplorer-tmpwatch
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/tmpwatch 24 /var/lib/ajaxplorer/tmp/
diff --git a/root/etc/cron.daily/ajaxplorer-indexer b/root/etc/cron.daily/pydio-indexer
similarity index 80%
rename from root/etc/cron.daily/ajaxplorer-indexer
rename to root/etc/cron.daily/pydio-indexer
index 98c5930..3a21bd4 100644
--- a/root/etc/cron.daily/ajaxplorer-indexer
+++ b/root/etc/cron.daily/pydio-indexer
@@ -26,17 +26,17 @@ foreach my $share ($a->get_all_by_prop(type => 'share')){
     next if ($ajaxplorer ne 'enabled' || $indexer ne 'enabled');
     my $name = $share->key;
     # Check if the lock file is present and if it's too old (last index crashed ?)
-    if (-e "/var/cache/ajaxplorer/indexes/.ajxp_lock-$name"){
-        my $mtime = stat("/var/cache/ajaxplorer/indexes/.ajxp_lock-$name")->mtime;
-        unlink </var/cache/ajaxplorer/indexes/.ajxp_lock-$name>
+    if (-e "/var/cache/pydio/indexes/.ajxp_lock-$name"){
+        my $mtime = stat("/var/cache/pydio/indexes/.ajxp_lock-$name")->mtime;
+        unlink </var/cache/pydio/indexes/.ajxp_lock-$name>
             if (time() - $mtime > 18000);
     }
-    system('/usr/bin/sudo -u www /usr/bin/php /usr/share/ajaxplorer/cmd.php ' .
+    system('/usr/bin/sudo -u www /usr/bin/php /usr/share/pydio/cmd.php ' .
            '-u=RDiin175M40T0cYvXLARpAi+1TsSVkbksEDZ4KvwBuY= '.
            '-t=e71479ebc4365176d9f09fe957780024 -a=index '.
            '-r='.$name.' --secure_token='.$id.' --dir=/ --_method=put >/dev/null 2>&1');
     # In some cases, the lock file is not removed, make sure it's unlocked
-    unlink </var/cache/ajaxplorer/indexes/.ajxp_lock-$name>;
+    unlink </var/cache/pydio/indexes/.ajxp_lock-$name>;
 }
 # We should now restart OOo to release memory
 if (-d '/var/service/ooo'){
diff --git a/root/etc/cron.daily/pydio-tmpwatch b/root/etc/cron.daily/pydio-tmpwatch
new file mode 100644
index 0000000..8bda10c
--- /dev/null
+++ b/root/etc/cron.daily/pydio-tmpwatch
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/sbin/tmpwatch 24 /var/lib/pydio/tmp/