[#55089104] Changed model names from being plural to singular.  All model names should be singular.