Added pluralization/singularization to association names.