Resolved a problem with org name