Small refactor to get subsystem name in the uri
Merge branch 'master' into mavenize