BUG: Compilation errors from not using correct typedef

Number of typedef argmuments incorrect

Change-Id: Ifc076e94b235826822b19cc96968a036f44a0e30
Merge "BUG: Compilation errors from not using correct typedef"