Merge "API: Standardize usage of "ID" in docs"