rename mostly working across multiple files