Rename all of the inconsistent files to the plural form

    We had a lot of related files where some versions where named
    in the singular and some in the plural.  We decided to
    standardize them.  This commit simply renames the files; will
    update the code in subsequent commits in hopes of preserving
    diffs.