update vocabulary

major URI changes: capitalization, camelCase, wording