Generic type parameters shouldn't be escaped - fixes #585
Merge pull request #586 from forki/Rename

Generic type parameters shouldn't be escaped - fixes #585