Minor changes to reflect repo name change. Added if/else for catching XS hosts.