Rename and do refactoring