Renaming and polishing the examples