renaming and minor changes