Renaming datataker, fixing some paths