Improve naming of JsonProvider and ApiaryProvider generated types

Fixes #164