Proper pluralization
Merge pull request #226 from mpharrigan/refactor-msm

Proper pluralization