More name fixing, lowercasing objects, proper-ing unique objects, plural...

...-ing some stuff that needs it.