Fixes in case conversion from under_scores to camelCase

Changes made. Need to sync up for the test case mocking.