sample namespace shift, a few other namespace fixes from the old version