rename logic bug fix