Fix example and some renames