Fix rename regression