style(names): rawData -> data; oneliners reverted