Fix up parent / child member naming confusion.