renaming, small changes