Change organisation type labels
Add translations