Update extension name and key name

Change-Id: I2f51e79c178f4450af9f5147eba45ec5f2a36ad0
Add missing underscore

Change-Id: I1887724ad68064ddfee94524f59cfba69993970d