Refactor some internal names