Minor tweaks to naming scheme in javascript to better match conventions.