rename fn properly