PIM-1922: Change titles and remove useless one