Fix js var name generation