Adjusted some names and permissions"