rename file and simplify