renaming and fixes