Readme improvement, some renaming