Use consistent type variable names
Realign all the things!