Upstream/Downstream name reconciliation for #201

Signed-off-by: Steve Loranz <sloranz@redhat.com>