rename de certain labels
Merge branch 'master'