Fixing broken association names that end with ss
Merge pull request #1090 from jimmybaker/issue-1083

Fixing broken association names that end with ss