Make names consistent stage 2.(still not complete).

(etl/load-csv ...) completes, data is present, webapp seems to work down
to the devices, but charts don't display. still investigating.