small fix and renaming