Heavy renaming and code recomposition