Update on this branch naming convention changes that were not properly merged