Refactor naming.