rename + decrement fix