Use typedef names
Merge pull request #6344 from wmtan/UseTypedefNames

Use typedef names