Adjust for new org. name