Fix some fail renaming