more renaming and example fixing