Some bad naming replace