Use titles already easily on hand

Change-Id: I31d3c7359021d27ad4e149411c91adde61db87e0