fixed js names so that it will be more consistent for future use