Rename to be clearer
Merge branch 'feature-rename-some-type-variables'