Codecs, take two

See previous closed PR for comments.  This one just adds the rename from BSON to Bson and JSON to Json