Merge "Corrected capitalization in the file and class names of API modules"