Renames and fixes examples