Rename the type list #26
Remove #includes #26
Modify the type aliases #26