fix for name replace feature