[FOLD] Rename
[FOLD] Refactor and tidy