Rename to tracker. Cleaner connect

Rename to tracker. Cleaner connect