Removed static org name again.