rename accross commits + integrated tests for 4 commits