more balanced set of RUnits, fixed NAMESPACE issue