refactor: renaming types