Minor refactoring
Rename ApiDoc accessors
Fix test suites
Rename ContextIndex accessors
Rename ContextIndex constructor