fix demo style
make names consistent
demo all included maps