Some renames and readme fixes