Issue 3233: Cleaning up the javascript naming that we're using to match closer with the coding standards