I just use a different prefix on the remote machine. Would that help?