renaming and small changes