The base class already has exactly the same members, so just use them instead. No real changes, just avoid (or at least reduce) confusion.
54e9150157