Fix build errors.
remote/local terms changed to parent/child.