Changed sourse repository, namespace fix