Change naming of local patch-related branches and unify