update to grammar change (foreignkey, id->name)