fixed js variable names