--- a/specs/stx-jv.rbspec	Tue Aug 15 10:44:12 2017 +0100
+++ b/specs/stx-jv.rbspec	Tue Aug 22 22:16:30 2017 +0100
@@ -37,7 +37,7 @@
   import :'stx:baseline'
 
   # FORKED STC and librun
-  package "stx:stc", :repository => :'swing:private:hg', :branch => 'jv', revision: 'stx-8.0.0',
+  package "stx:stc", :repository => :'jv-branch:private', :branch => 'jv', revision: 'stx-8.0.0',
     :checkout => (Proc.new do | pkg |
     # Download pre-compiled binary if user has no access to source code    
     if Rake::Stx::Configuration::Repository::find(pkg.repository) then
@@ -54,7 +54,7 @@
     end
   end)
 
-  package "stx:librun", :repository => :'swing:private:hg', :branch => 'jv', revision: 'stx-8.0.0',
+  package "stx:librun", :repository => :'jv-branch:private', :branch => 'jv', revision: 'stx-8.0.0',
     :checkout => (Proc.new do | pkg |
     # Download pre-compiled binary if user has no access to source code
     if Rake::Stx::Configuration::Repository::find(pkg.repository) then
@@ -73,22 +73,22 @@
 
   # FORKED libraries
   # ======================================================================
-  package "stx:libbasic", :repository => :'bitbucket:janvrany', :branch => 'jv', revision: 'stx-8.0.0'
-  package "stx:libbasic2", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libbasic3", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libcomp", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libtool", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libtool2",:repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libbasic", :repository => :'jv-branch:public', :branch => 'jv', revision: 'stx-8.0.0'
+  package "stx:libbasic2", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libbasic3", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libcomp", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libtool", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libtool2",:repository => :'jv-branch:public', :branch => 'jv'
  
-  package "stx:libview", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libview2", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libwidg", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libwidg2", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libview", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libview2", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libwidg", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libwidg2", :repository => :'jv-branch:public', :branch => 'jv'
 
-  package "stx:goodies/sunit", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:goodies/monticello", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:goodies/refactoryBrowser", :repository => :'bitbucket:janvrany', :branch => 'jv'
-  package "stx:libsvn", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:goodies/sunit", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:goodies/monticello", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:goodies/refactoryBrowser", :repository => :'jv-branch:public', :branch => 'jv'
+  package "stx:libsvn", :repository => :'jv-branch:public', :branch => 'jv'
 
   # Some more development tools to build and preload
   # ======================================================================
@@ -97,7 +97,7 @@
   
   # SmallSense
   package "stx:goodies/regex", :repository => :'exept:public'
-  package "stx:goodies/smallsense", :repository => :'bitbucket:janvrany'
+  package "stx:goodies/smallsense", :repository => :'jv-branch:public'
   package "stx:goodies/smallsense/refactoring_custom"
 
   
@@ -180,7 +180,7 @@
   app_version "6.2.5_#{BUILD_ID}"
 
   # Forked PetitParser
-  package "stx:goodies/petitparser", :repository => :'bitbucket:janvrany', :link => false
+  package "stx:goodies/petitparser", :repository => :'jv-branch:public', :link => false
   package "stx:goodies/petitparser/tests", :link => false
   package "stx:goodies/petitparser/analyzer",  :link => false
   package "stx:goodies/petitparser/analyzer/tests",  :link => false
@@ -190,26 +190,26 @@
   package "stx:goodies/communication", :repository => :'exept:public'
 
   # Java support
-  package "stx:libjava", :repository => :'bitbucket:janvrany'
+  package "stx:libjava", :repository => :'jv-branch:public'
   package "stx:libjava/tools"
   package "stx:libjava/experiments"
   #package "stx:libjava/examples" :link => false
 
   # Smalltalk/X IDE
-  application 'stx:projects/smalltalk', :repository => :'bitbucket:janvrany', :branch => 'jv'
+  application 'stx:projects/smalltalk', :repository => :'jv-branch:public', :branch => 'jv'
 
-  package 'stx:libscm', :repository => :'bitbucket:janvrany'
-  package 'stx:libscm/common', :repository => :'bitbucket:janvrany'
-  package 'stx:libscm/mercurial', :repository => :'bitbucket:janvrany'
-  package 'stx:libscm/mercurial/monticello', :repository => :'bitbucket:janvrany'
-  package 'stx:goodies/ring', :repository => :'bitbucket:janvrany', :link => false
-  package 'stx:goodies/libcairo', :repository => :'bitbucket:janvrany', :link => false
-  package 'stx:goodies/cypress', :repository => :'bitbucket:janvrany'
-  package "stx:goodies/xmlsuite", :repository => :'bitbucket:janvrany'  
+  package 'stx:libscm', :repository => :'jv-branch:public'
+  package 'stx:libscm/common', :repository => :'jv-branch:public'
+  package 'stx:libscm/mercurial', :repository => :'jv-branch:public'
+  package 'stx:libscm/mercurial/monticello', :repository => :'jv-branch:public'
+  package 'stx:goodies/ring', :repository => :'jv-branch:public', :link => false
+  package 'stx:goodies/libcairo', :repository => :'jv-branch:public', :link => false
+  package 'stx:goodies/cypress', :repository => :'jv-branch:public'
+  package "stx:goodies/xmlsuite", :repository => :'jv-branch:public'  
   package "stx:goodies/loggia", :repository => :'exept:public', :link => false
-  package 'stx:goodies/smaCC',:repository => :'bitbucket:janvrany'
-  package 'stx:goodies/regression',:repository => :'bitbucket:janvrany', :branch => 'jv', revision: 'stx-8.0.0', :link => false
-  package "stx:goodies/builder", :repository => :'bitbucket:janvrany',:branch => 'jv', :link => false
+  package 'stx:goodies/smaCC',:repository => :'jv-branch:public'
+  package 'stx:goodies/regression',:repository => :'jv-branch:public', :branch => 'jv', revision: 'stx-8.0.0', :link => false
+  package "stx:goodies/builder", :repository => :'jv-branch:public',:branch => 'jv', :link => false
   package "stx:goodies/builder/reports"
 
   # Define a "default" test suite, i.e., a set of tests that are run when