minor refactoring in yang models and member name changes

Change-Id: I454d2db00d612c0a925d29bbeb1688adda1b5033
Signed-off-by: Amit Mandke <ammandke@cisco.com>