Package cleaning - phase 2 - correct NAMESPACE