Commit fixing and some renaming