Rename labels based on discussion in symphonycms#1587