code renaming and re-engineering