Trying to remove .json everywhere

- No need to have .json. The name converted to a filename should be
sufficient.