updated names to be fully consistant with -name-color