add rename query generator