more complete rename