Format generic-typed model names
Merge pull request #878 from timothyherrera/generictypes

Format generic-typed model names