Consistent type naming ftw