Some renaming and fixes