Changes after pull-request comments in bug fix for under_score to camelCase