Fixed P26 renaming issue