rename .rest members to .attribute or .operation as appropriate to make usage consistent
add keyword markup
merge