renaming, minor changes