Using correct name convention for generics; fixes #114
Merge branch 'master' of github.com:LibertyEiffel/Liberty
Merge branch 'master' of github.com:LibertyEiffel/Liberty