Further progress and some renaming