try to add renaming capabilities