more renaming, viewer bug fix