Update and fix usage of labels/page titles