More renaming and Permission Refactoring