Rename IStorage to IStorageService and IStorageSpace to IStorage
diff --git a/org.eclipse.userstorage.releng/UserStorage.setup b/org.eclipse.userstorage.releng/UserStorage.setup
index 62387ee..c25f87b 100644
--- a/org.eclipse.userstorage.releng/UserStorage.setup
+++ b/org.eclipse.userstorage.releng/UserStorage.setup
@@ -5,11 +5,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
+    xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
     xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 index:/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"
     name="userstorage"
     label="User Storage SDK">
   <setupTask
@@ -167,6 +168,30 @@
           name="Mars"/>
     </targlet>
   </setupTask>
+  <setupTask
+      xsi:type="mylyn:MylynQueriesTask"
+      repositoryURL="https://bugs.eclipse.org/bugs"
+      userID="${bugzilla.id}"
+      password="${eclipse.user.password}">
+    <query summary="UserStorage Bugs"
+        url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Oomph&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial"/>
+    <query summary="UserStorage Features"
+        url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Oomph&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=enhancement"/>
+    <query summary="UserStorage Resolved in 1.0.0"
+        url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Oomph&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;version=1.0.0"/>
+    <query summary="UserStorage Unspecified Version"
+        url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Oomph&amp;version=unspecified"/>
+  </setupTask>
+  <setupTask
+      xsi:type="mylyn:MylynBuildsTask"
+      serverURL="https://hudson.eclipse.org/oomph"
+      userID="${bugzilla.id}"
+      password="${eclipse.user.password}">
+    <buildPlan
+        name="uss-integration"/>
+    <buildPlan
+        name="uss-integration-nightly"/>
+  </setupTask>
   <stream name="master"
       label="Master">
     <setupTask
diff --git a/pom.xml b/pom.xml
index 5bbd8df..f8d7432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,7 @@
           </appArgLine>
           <argLine>
             -Xmx1g
-            -Dorg.eclipse.userstorage.credentialsProvider=org.eclipse.userstorage.tests.FixedCredentialsProvider
-            -Dorg.eclipse.userstorage.internal.Storage.transientCredentials=true
-            -Dorg.eclipse.userstorage.internal.StorageRegistry.transientApplications=true
+            -Dorg.eclipse.userstorage.credentialsProvider=org.eclipse.userstorage.tests.util.FixedCredentialsProvider
             -Dorg.eclipse.userstorage.internal.Session.debug=true
           </argLine>
         </configuration>