Rework and renaming