better remote naming when bootstrapping

Should solve 2nd problem evoked in #454