Some renaming otherwise import will not work + order connection setup