Improved organization name handling