Improve JS variable names