Fix possible renaming issue