#10 renaming of generic type attributes for better readability