Fix view
Rename context-name -> context-id