implemented rename
cleaned up Rename parser
Merge branch 'dev-rename' into dev