Merge "Move "API" constants to API classes"