Fixed name change behavior