Fix dashboard names.
Merge master into demo.