Changes for org name with a dot