Fix rename issues