make conf/method names for target and upstream repos more general