Changed name convention for data() attributes