Merge pull request #101 from vasily-kirichenko/fix-generic-parameters-renaming

Fix generic parameters renaming
Merge branch 'master' into navigate-to-standalone-files