Change regexp to named placeholders

Change-Id: Ib39c605c8071833a44de3398583f6160fec775c2