Switched to javascript naming scheme