refactor naming companions