readme update and some renaming