Added nouns

I replaced all versions of "noun" with an applicable noun. Issue #2