Merge "Fix to remove camel case for Northbound API"