more renaming, added webmap demo