Renaming private fields is working

- Limitations: handling partial files, incorrect tabulation