Rename refactor

Last updated