Fixing namespace conflict for pending