SONAR-4444 Rename some assign options