adapt to dui renaming