javascript: more name fixes