diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/UriInfoStore.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfoStore.java
similarity index 91%
rename from scm-core/src/main/java/sonia/scm/api/v2/resources/UriInfoStore.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfoStore.java
index 5193ea6937..caa1183378 100644
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/UriInfoStore.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfoStore.java
@@ -2,7 +2,7 @@ package sonia.scm.api.v2.resources;
 
 import javax.ws.rs.core.UriInfo;
 
-public class UriInfoStore {
+public class ScmPathInfoStore {
 
   private UriInfo uriInfo;
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
index 651e4b3a7d..450f1d4495 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
@@ -1,6 +1,6 @@
 package sonia.scm.repository.spi;
 
-import sonia.scm.api.v2.resources.UriInfoStore;
+import sonia.scm.api.v2.resources.ScmPathInfoStore;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.Repository;
 import sonia.scm.web.filter.PermissionFilter;
@@ -16,13 +16,13 @@ public abstract class InitializingHttpScmProtocolWrapper {
 
   private final Provider<? extends ScmProviderHttpServlet> delegateProvider;
   private final Provider<? extends PermissionFilter> permissionFilterProvider;
-  private final Provider<UriInfoStore> uriInfoStore;
+  private final Provider<ScmPathInfoStore> uriInfoStore;
   private final ScmConfiguration scmConfiguration;
 
   private volatile boolean isInitialized = false;
 
 
-  protected InitializingHttpScmProtocolWrapper(Provider<? extends ScmProviderHttpServlet> delegateProvider, Provider<? extends PermissionFilter> permissionFilterProvider, Provider<UriInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
+  protected InitializingHttpScmProtocolWrapper(Provider<? extends ScmProviderHttpServlet> delegateProvider, Provider<? extends PermissionFilter> permissionFilterProvider, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
     this.delegateProvider = delegateProvider;
     this.permissionFilterProvider = permissionFilterProvider;
     this.uriInfoStore = uriInfoStore;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java
index 7163497487..7607b31faf 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java
@@ -18,7 +18,7 @@ import static de.otto.edison.hal.Links.linkingTo;
 public abstract class GitConfigToGitConfigDtoMapper extends BaseMapper<GitConfig, GitConfigDto> {
 
   @Inject
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @AfterMapping
   void appendLinks(GitConfig config, @MappingTarget GitConfigDto target) {
@@ -30,12 +30,12 @@ public abstract class GitConfigToGitConfigDtoMapper extends BaseMapper<GitConfig
   }
 
   private String self() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), GitConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), GitConfigResource.class);
     return linkBuilder.method("get").parameters().href();
   }
 
   private String update() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), GitConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), GitConfigResource.class);
     return linkBuilder.method("update").parameters().href();
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java
index cda8431283..8ff0c6d421 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java
@@ -1,6 +1,6 @@
 package sonia.scm.web;
 
-import sonia.scm.api.v2.resources.UriInfoStore;
+import sonia.scm.api.v2.resources.ScmPathInfoStore;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
 
@@ -11,7 +11,7 @@ import javax.inject.Singleton;
 @Singleton
 public class GitScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
   @Inject
-  public GitScmProtocolProviderWrapper(Provider<ScmGitServlet> servletProvider, Provider<GitPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
+  public GitScmProtocolProviderWrapper(Provider<ScmGitServlet> servletProvider, Provider<GitPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
     super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
index 44603a65d3..1ebe7fc98b 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
@@ -53,7 +53,7 @@ public class GitConfigResourceTest {
   private GitConfigDtoToGitConfigMapperImpl dtoToConfigMapper;
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private GitConfigToGitConfigDtoMapperImpl configToDtoMapper;
@@ -67,7 +67,7 @@ public class GitConfigResourceTest {
     when(repositoryHandler.getConfig()).thenReturn(gitConfig);
     GitConfigResource gitConfigResource = new GitConfigResource(dtoToConfigMapper, configToDtoMapper, repositoryHandler);
     dispatcher.getRegistry().addSingletonResource(gitConfigResource);
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
   }
 
   @Test
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapperTest.java
index 903ee4e653..82c85029a3 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapperTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapperTest.java
@@ -28,7 +28,7 @@ public class GitConfigToGitConfigDtoMapperTest {
   private URI baseUri = URI.create("http://example.com/base/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private GitConfigToGitConfigDtoMapperImpl mapper;
@@ -40,7 +40,7 @@ public class GitConfigToGitConfigDtoMapperTest {
 
   @Before
   public void init() {
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
     expectedBaseUri = baseUri.resolve(GitConfigResource.GIT_CONFIG_PATH_V2);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapper.java
index d2f4aecf7e..da980f75c0 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapper.java
@@ -8,11 +8,11 @@ import static de.otto.edison.hal.Links.linkingTo;
 
 public class HgConfigInstallationsToDtoMapper {
 
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @Inject
-  public HgConfigInstallationsToDtoMapper(UriInfoStore uriInfoStore) {
-    this.uriInfoStore = uriInfoStore;
+  public HgConfigInstallationsToDtoMapper(ScmPathInfoStore scmPathInfoStore) {
+    this.scmPathInfoStore = scmPathInfoStore;
   }
 
   public HgConfigInstallationsDto map(List<String> installations, String path) {
@@ -20,7 +20,7 @@ public class HgConfigInstallationsToDtoMapper {
   }
 
   private String createSelfLink(String path) {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
     return linkBuilder.method("getInstallationsResource").parameters().href() + '/' + path;
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapper.java
index 67d7e58dff..3ee87cef84 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapper.java
@@ -20,7 +20,7 @@ import static de.otto.edison.hal.Links.linkingTo;
 public abstract class HgConfigPackagesToDtoMapper  {
 
   @Inject
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   public HgConfigPackagesDto map(HgPackages hgpackages) {
     return map(new HgPackagesNonIterable(hgpackages));
@@ -40,7 +40,7 @@ public abstract class HgConfigPackagesToDtoMapper  {
   }
 
   private String createSelfLink() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
     return linkBuilder.method("getPackagesResource").parameters().href();
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java
index 98137aebd5..b2a67e2aa4 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java
@@ -18,7 +18,7 @@ import static de.otto.edison.hal.Links.linkingTo;
 public abstract class HgConfigToHgConfigDtoMapper extends BaseMapper<HgConfig, HgConfigDto> {
 
   @Inject
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @AfterMapping
   void appendLinks(HgConfig config, @MappingTarget HgConfigDto target) {
@@ -30,12 +30,12 @@ public abstract class HgConfigToHgConfigDtoMapper extends BaseMapper<HgConfig, H
   }
 
   private String self() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
     return linkBuilder.method("get").parameters().href();
   }
 
   private String update() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
     return linkBuilder.method("update").parameters().href();
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
index 9cb22363ce..e843f09ad4 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
@@ -1,6 +1,6 @@
 package sonia.scm.web;
 
-import sonia.scm.api.v2.resources.UriInfoStore;
+import sonia.scm.api.v2.resources.ScmPathInfoStore;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
 
@@ -11,7 +11,7 @@ import javax.inject.Singleton;
 @Singleton
 public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
   @Inject
-  public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
+  public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
     super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java
index 748b2c1b6e..65b9c262cb 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java
@@ -43,7 +43,7 @@ public class HgConfigInstallationsResourceTest {
   private final URI baseUri = URI.create("/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigInstallationsToDtoMapper mapper;
@@ -61,7 +61,7 @@ public class HgConfigInstallationsResourceTest {
       new HgConfigResource(null, null, null, null,
                            null, resourceProvider));
 
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
   }
 
   @Test
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapperTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapperTest.java
index fcc90ee4e6..7cae1d9f7e 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapperTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapperTest.java
@@ -23,7 +23,7 @@ public class HgConfigInstallationsToDtoMapperTest {
   private URI baseUri = URI.create("http://example.com/base/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigInstallationsToDtoMapper mapper;
@@ -34,7 +34,7 @@ public class HgConfigInstallationsToDtoMapperTest {
 
   @Before
   public void init() {
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
     expectedBaseUri = baseUri.resolve(HgConfigResource.HG_CONFIG_PATH_V2 + "/installations/" + expectedPath);
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java
index f24b30f515..f1558b6efb 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java
@@ -57,7 +57,7 @@ public class HgConfigPackageResourceTest {
   private final URI baseUri = java.net.URI.create("/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigPackagesToDtoMapperImpl mapper;
@@ -81,7 +81,7 @@ public class HgConfigPackageResourceTest {
   public void prepareEnvironment() {
     setupResources();
 
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
 
     when(hgPackageReader.getPackages().getPackages()).thenReturn(createPackages());
   }
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapperTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapperTest.java
index 0773499462..c4431da6d5 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapperTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapperTest.java
@@ -26,7 +26,7 @@ public class HgConfigPackagesToDtoMapperTest {
   private URI baseUri = URI.create("http://example.com/base/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigPackagesToDtoMapperImpl mapper;
@@ -35,7 +35,7 @@ public class HgConfigPackagesToDtoMapperTest {
 
   @Before
   public void init() {
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
     expectedBaseUri = baseUri.resolve(HgConfigResource.HG_CONFIG_PATH_V2 + "/packages");
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java
index aa29603ff1..9cd04a0789 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java
@@ -54,7 +54,7 @@ public class HgConfigResourceTest {
   private HgConfigDtoToHgConfigMapperImpl dtoToConfigMapper;
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigToHgConfigDtoMapperImpl configToDtoMapper;
@@ -79,7 +79,7 @@ public class HgConfigResourceTest {
       new HgConfigResource(dtoToConfigMapper, configToDtoMapper, repositoryHandler, packagesResource,
                            autoconfigResource, installationsResource);
     dispatcher.getRegistry().addSingletonResource(gitConfigResource);
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
   }
 
   @Test
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java
index 3f22c12f86..81c50f3d58 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java
@@ -29,7 +29,7 @@ public class HgConfigToHgConfigDtoMapperTest {
   private URI baseUri = URI.create("http://example.com/base/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private HgConfigToHgConfigDtoMapperImpl mapper;
@@ -41,7 +41,7 @@ public class HgConfigToHgConfigDtoMapperTest {
 
   @Before
   public void init() {
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
     expectedBaseUri = baseUri.resolve(HgConfigResource.HG_CONFIG_PATH_V2);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java
index a71d75151d..c160280822 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java
@@ -18,7 +18,7 @@ import static de.otto.edison.hal.Links.linkingTo;
 public abstract class SvnConfigToSvnConfigDtoMapper extends BaseMapper<SvnConfig, SvnConfigDto> {
 
   @Inject
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @AfterMapping
   void appendLinks(SvnConfig config, @MappingTarget SvnConfigDto target) {
@@ -30,12 +30,12 @@ public abstract class SvnConfigToSvnConfigDtoMapper extends BaseMapper<SvnConfig
   }
 
   private String self() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), SvnConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), SvnConfigResource.class);
     return linkBuilder.method("get").parameters().href();
   }
 
   private String update() {
-    LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), SvnConfigResource.class);
+    LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), SvnConfigResource.class);
     return linkBuilder.method("update").parameters().href();
   }
 }
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java
index 99f5b42fb2..ebcfa138bc 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java
@@ -1,6 +1,6 @@
 package sonia.scm.web;
 
-import sonia.scm.api.v2.resources.UriInfoStore;
+import sonia.scm.api.v2.resources.ScmPathInfoStore;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
 import sonia.scm.repository.spi.ScmProviderHttpServlet;
@@ -19,7 +19,7 @@ public class SvnScmProtocolProviderWrapper extends InitializingHttpScmProtocolWr
   public static final String PARAMETER_SVN_PARENTPATH = "SVNParentPath";
 
   @Inject
-  public SvnScmProtocolProviderWrapper(Provider<SvnDAVServlet> servletProvider, Provider<SvnPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
+  public SvnScmProtocolProviderWrapper(Provider<SvnDAVServlet> servletProvider, Provider<SvnPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
     super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
   }
 
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java
index 67f3e47950..28dbe09e92 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java
@@ -53,7 +53,7 @@ public class SvnConfigResourceTest {
   private SvnConfigDtoToSvnConfigMapperImpl dtoToConfigMapper;
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private SvnConfigToSvnConfigDtoMapperImpl configToDtoMapper;
@@ -67,7 +67,7 @@ public class SvnConfigResourceTest {
     when(repositoryHandler.getConfig()).thenReturn(gitConfig);
     SvnConfigResource gitConfigResource = new SvnConfigResource(dtoToConfigMapper, configToDtoMapper, repositoryHandler);
     dispatcher.getRegistry().addSingletonResource(gitConfigResource);
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
   }
 
   @Test
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapperTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapperTest.java
index cfe2c59772..5184aa3d41 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapperTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapperTest.java
@@ -30,7 +30,7 @@ public class SvnConfigToSvnConfigDtoMapperTest {
   private URI baseUri = URI.create("http://example.com/base/");
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @InjectMocks
   private SvnConfigToSvnConfigDtoMapperImpl mapper;
@@ -42,7 +42,7 @@ public class SvnConfigToSvnConfigDtoMapperTest {
 
   @Before
   public void init() {
-    when(uriInfoStore.get().getApiRestUri()).thenReturn(baseUri);
+    when(scmPathInfoStore.get().getApiRestUri()).thenReturn(baseUri);
     expectedBaseUri = baseUri.resolve(SvnConfigResource.SVN_CONFIG_PATH_V2);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/UriInfoFilter.java b/scm-webapp/src/main/java/sonia/scm/api/rest/UriInfoFilter.java
index de0f1dd626..1683d5c11a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/UriInfoFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/UriInfoFilter.java
@@ -1,6 +1,6 @@
 package sonia.scm.api.rest;
 
-import sonia.scm.api.v2.resources.UriInfoStore;
+import sonia.scm.api.v2.resources.ScmPathInfoStore;
 
 import javax.inject.Inject;
 import javax.ws.rs.container.ContainerRequestContext;
@@ -10,10 +10,10 @@ import javax.ws.rs.ext.Provider;
 @Provider
 public class UriInfoFilter implements ContainerRequestFilter {
 
-  private final javax.inject.Provider<UriInfoStore> storeProvider;
+  private final javax.inject.Provider<ScmPathInfoStore> storeProvider;
 
   @Inject
-  public UriInfoFilter(javax.inject.Provider<UriInfoStore> storeProvider) {
+  public UriInfoFilter(javax.inject.Provider<ScmPathInfoStore> storeProvider) {
     this.storeProvider = storeProvider;
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
index 9cadbfb6ff..7d8b015c27 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
@@ -39,6 +39,6 @@ public class MapperModule extends AbstractModule {
     bind(UIPluginDtoMapper.class);
     bind(UIPluginDtoCollectionMapper.class);
 
-    bind(UriInfoStore.class).in(ServletScopes.REQUEST);
+    bind(ScmPathInfoStore.class).in(ServletScopes.REQUEST);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
index 74ce1a65dd..ce716f2f6f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
@@ -31,7 +31,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
   @Inject
   private RepositoryServiceFactory serviceFactory;
   @Inject
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   abstract HealthCheckFailureDto toDto(HealthCheckFailure failure);
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index 7059ea257d..47c464f916 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -7,16 +7,16 @@ import java.net.URI;
 
 class ResourceLinks {
 
-  private final UriInfoStore uriInfoStore;
+  private final ScmPathInfoStore scmPathInfoStore;
 
   @Inject
-  ResourceLinks(UriInfoStore uriInfoStore) {
-    this.uriInfoStore = uriInfoStore;
+  ResourceLinks(ScmPathInfoStore scmPathInfoStore) {
+    this.scmPathInfoStore = scmPathInfoStore;
   }
 
 
   GroupLinks group() {
-    return new GroupLinks(uriInfoStore.get());
+    return new GroupLinks(scmPathInfoStore.get());
   }
 
   static class GroupLinks {
@@ -40,7 +40,7 @@ class ResourceLinks {
   }
 
   GroupCollectionLinks groupCollection() {
-    return new GroupCollectionLinks(uriInfoStore.get());
+    return new GroupCollectionLinks(scmPathInfoStore.get());
   }
 
   static class GroupCollectionLinks {
@@ -60,7 +60,7 @@ class ResourceLinks {
   }
 
   UserLinks user() {
-    return new UserLinks(uriInfoStore.get());
+    return new UserLinks(scmPathInfoStore.get());
   }
 
   static class UserLinks {
@@ -84,7 +84,7 @@ class ResourceLinks {
   }
 
   UserCollectionLinks userCollection() {
-    return new UserCollectionLinks(uriInfoStore.get());
+    return new UserCollectionLinks(scmPathInfoStore.get());
   }
 
   static class UserCollectionLinks {
@@ -104,7 +104,7 @@ class ResourceLinks {
   }
 
   ConfigLinks config() {
-    return new ConfigLinks(uriInfoStore.get());
+    return new ConfigLinks(scmPathInfoStore.get());
   }
 
   static class ConfigLinks {
@@ -124,7 +124,7 @@ class ResourceLinks {
   }
 
   public RepositoryLinks repository() {
-    return new RepositoryLinks(uriInfoStore.get());
+    return new RepositoryLinks(scmPathInfoStore.get());
   }
 
   static class RepositoryLinks {
@@ -150,7 +150,7 @@ class ResourceLinks {
   }
 
   RepositoryCollectionLinks repositoryCollection() {
-    return new RepositoryCollectionLinks(uriInfoStore.get());
+    return new RepositoryCollectionLinks(scmPathInfoStore.get());
   }
 
   static class RepositoryCollectionLinks {
@@ -170,7 +170,7 @@ class ResourceLinks {
   }
 
   public RepositoryTypeLinks repositoryType() {
-    return new RepositoryTypeLinks(uriInfoStore.get());
+    return new RepositoryTypeLinks(scmPathInfoStore.get());
   }
 
   static class RepositoryTypeLinks {
@@ -186,7 +186,7 @@ class ResourceLinks {
   }
 
   public RepositoryTypeCollectionLinks repositoryTypeCollection() {
-    return new RepositoryTypeCollectionLinks(uriInfoStore.get());
+    return new RepositoryTypeCollectionLinks(scmPathInfoStore.get());
   }
 
   static class RepositoryTypeCollectionLinks {
@@ -203,7 +203,7 @@ class ResourceLinks {
 
 
   public TagCollectionLinks tag() {
-    return new TagCollectionLinks(uriInfoStore.get());
+    return new TagCollectionLinks(scmPathInfoStore.get());
   }
 
   static class TagCollectionLinks {
@@ -223,7 +223,7 @@ class ResourceLinks {
   }
 
   public DiffLinks diff() {
-    return new DiffLinks(uriInfoStore.get());
+    return new DiffLinks(scmPathInfoStore.get());
   }
 
   static class DiffLinks {
@@ -243,7 +243,7 @@ class ResourceLinks {
   }
 
   public BranchLinks branch() {
-    return new BranchLinks(uriInfoStore.get());
+    return new BranchLinks(scmPathInfoStore.get());
   }
 
   static class BranchLinks {
@@ -263,7 +263,7 @@ class ResourceLinks {
   }
 
   public BranchCollectionLinks branchCollection() {
-    return new BranchCollectionLinks(uriInfoStore.get());
+    return new BranchCollectionLinks(scmPathInfoStore.get());
   }
 
   static class BranchCollectionLinks {
@@ -279,7 +279,7 @@ class ResourceLinks {
   }
 
   public ChangesetLinks changeset() {
-    return new ChangesetLinks(uriInfoStore.get());
+    return new ChangesetLinks(scmPathInfoStore.get());
   }
 
   static class ChangesetLinks {
@@ -303,7 +303,7 @@ class ResourceLinks {
   }
 
   public SourceLinks source() {
-    return new SourceLinks(uriInfoStore.get());
+    return new SourceLinks(scmPathInfoStore.get());
   }
 
   static class SourceLinks {
@@ -339,7 +339,7 @@ class ResourceLinks {
     }
   }
   public PermissionLinks permission() {
-    return new PermissionLinks(uriInfoStore.get());
+    return new PermissionLinks(scmPathInfoStore.get());
   }
 
   static class PermissionLinks {
@@ -376,7 +376,7 @@ class ResourceLinks {
 
 
   public UIPluginLinks uiPlugin() {
-    return new UIPluginLinks(uriInfoStore.get());
+    return new UIPluginLinks(scmPathInfoStore.get());
   }
 
   static class UIPluginLinks {
@@ -392,7 +392,7 @@ class ResourceLinks {
   }
 
   public UIPluginCollectionLinks uiPluginCollection() {
-    return new UIPluginCollectionLinks(uriInfoStore.get());
+    return new UIPluginCollectionLinks(scmPathInfoStore.get());
   }
 
   static class UIPluginCollectionLinks {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
index 5b457ce4e9..b6dcf6d809 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
@@ -29,8 +29,8 @@ import static sonia.scm.PageResult.createPage;
 public class GroupCollectionToDtoMapperTest {
 
   private final UriInfo uriInfo = mock(UriInfo.class);
-  private final UriInfoStore uriInfoStore = new UriInfoStore();
-  private final ResourceLinks resourceLinks = new ResourceLinks(uriInfoStore);
+  private final ScmPathInfoStore scmPathInfoStore = new ScmPathInfoStore();
+  private final ResourceLinks resourceLinks = new ResourceLinks(scmPathInfoStore);
   private final GroupToGroupDtoMapper groupToDtoMapper = mock(GroupToGroupDtoMapper.class);
   private final Subject subject = mock(Subject.class);
   private final ThreadState subjectThreadState = new SubjectThreadState(subject);
@@ -41,7 +41,7 @@ public class GroupCollectionToDtoMapperTest {
 
   @Before
   public void init() throws URISyntaxException {
-    uriInfoStore.set(uriInfo);
+    scmPathInfoStore.set(uriInfo);
     URI baseUri = new URI("http://example.com/base/");
     expectedBaseUri = baseUri.resolve(GroupRootResource.GROUPS_PATH_V2 + "/");
     when(uriInfo.getBaseUri()).thenReturn(baseUri);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
index 0040e8b45e..b92bcbb532 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
@@ -41,7 +41,7 @@ public class MeResourceTest {
   @Mock
   private ScmPathInfo uriInfo;
   @Mock
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
 
   @Mock
   private UserManager userManager;
@@ -62,7 +62,7 @@ public class MeResourceTest {
     MeResource meResource = new MeResource(userToDtoMapper, userManager);
     dispatcher.getRegistry().addSingletonResource(meResource);
     when(uriInfo.getApiRestUri()).thenReturn(URI.create("/"));
-    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(scmPathInfoStore.get()).thenReturn(uriInfo);
   }
 
   @Test
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index 9fdef26d13..ca679764ad 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -70,7 +70,7 @@ public class RepositoryRootResourceTest {
   @Mock
   private RepositoryService service;
   @Mock
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
   @Mock
   private ScmPathInfo uriInfo;
 
@@ -91,7 +91,7 @@ public class RepositoryRootResourceTest {
     RepositoryCollectionResource repositoryCollectionResource = new RepositoryCollectionResource(repositoryManager, repositoryCollectionToDtoMapper, dtoToRepositoryMapper, resourceLinks);
     RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(repositoryResource), MockProvider.of(repositoryCollectionResource));
     when(serviceFactory.create(any(Repository.class))).thenReturn(service);
-    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(scmPathInfoStore.get()).thenReturn(uriInfo);
     when(uriInfo.getApiRestUri()).thenReturn(URI.create("/x/y"));
     dispatcher = createDispatcher(repositoryRootResource);
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
index 250da56908..0fbece9730 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
@@ -48,7 +48,7 @@ public class RepositoryToRepositoryDtoMapperTest {
   @Mock
   private RepositoryService repositoryService;
   @Mock
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
   @Mock
   private ScmPathInfo uriInfo;
 
@@ -61,7 +61,7 @@ public class RepositoryToRepositoryDtoMapperTest {
     when(serviceFactory.create(any(Repository.class))).thenReturn(repositoryService);
     when(repositoryService.isSupported(any(Command.class))).thenReturn(true);
     when(repositoryService.getSupportedProtocols()).thenReturn(emptySet());
-    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(scmPathInfoStore.get()).thenReturn(uriInfo);
     when(uriInfo.getApiRestUri()).thenReturn(URI.create("/x/y"));
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java
index 0f33476436..0544bf6a0d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java
@@ -17,7 +17,7 @@ public class ResourceLinksTest {
   private static final String BASE_URL = "http://example.com/";
 
   @Mock
-  private UriInfoStore uriInfoStore;
+  private ScmPathInfoStore scmPathInfoStore;
   @Mock
   private ScmPathInfo uriInfo;
 
@@ -176,7 +176,7 @@ public class ResourceLinksTest {
   @Before
   public void initUriInfo() {
     initMocks(this);
-    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(scmPathInfoStore.get()).thenReturn(uriInfo);
     when(uriInfo.getApiRestUri()).thenReturn(URI.create(BASE_URL));
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UriInfoStoreTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ScmPathInfoStoreTest.java
similarity index 63%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/UriInfoStoreTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/ScmPathInfoStoreTest.java
index da0682c640..4c3f49d2fd 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UriInfoStoreTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ScmPathInfoStoreTest.java
@@ -3,35 +3,34 @@ package sonia.scm.api.v2.resources;
 import org.junit.Test;
 
 import javax.ws.rs.core.UriInfo;
-
 import java.net.URI;
 
 import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class UriInfoStoreTest {
+public class ScmPathInfoStoreTest {
 
   @Test
   public void shouldReturnSetInfo() {
     URI someUri = URI.create("/anything");
 
     UriInfo uriInfo = mock(UriInfo.class);
-    UriInfoStore uriInfoStore = new UriInfoStore();
+    ScmPathInfoStore scmPathInfoStore = new ScmPathInfoStore();
 
     when(uriInfo.getBaseUri()).thenReturn(someUri);
 
-    uriInfoStore.set(uriInfo);
+    scmPathInfoStore.set(uriInfo);
 
-    assertSame(someUri, uriInfoStore.get().getApiRestUri());
+    assertSame(someUri, scmPathInfoStore.get().getApiRestUri());
   }
 
   @Test(expected = IllegalStateException.class)
   public void shouldFailIfSetTwice() {
     UriInfo uriInfo = mock(UriInfo.class);
-    UriInfoStore uriInfoStore = new UriInfoStore();
+    ScmPathInfoStore scmPathInfoStore = new ScmPathInfoStore();
 
-    uriInfoStore.set(uriInfo);
-    uriInfoStore.set(uriInfo);
+    scmPathInfoStore.set(uriInfo);
+    scmPathInfoStore.set(uriInfo);
   }
 }