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

Change-Id: I98108c42269fde75530fa57c5b611fd24e4aaa2c