Made data names more javascript friendly