Add missing "typename". Rename type in macro. am: e9f90a21c0 am: af1af98848
am: 1e3a5887f5

Change-Id: I07cec4eedad1df733d6c8d138f81a79288579e52