Refactor: renames and cleanups