Improve naming of ApiaryProvider generated types