some minor fixes
improve renaming.