rename model and field names in klp models as per issue #1