finish renaming issues #20