Improve parsing and handle renaming