Let's just have one typedef and use it across the board.

Change-Id: Iadfbeb5b97673a8812c90411ff2e49324347ee24