Adjust prefix to new format

Change-Id: Ibbb2675ba68d5d890739cc315183e8aa7adbbd71