EPEDEV-211 - updated the name and org handling