Fix titles and wordings