Add missing name color terminators in some places