updated some js var names