Added Tracker word to class name
Revert "Added Tracker word to class name"

This reverts commit 9aa76809cf46970cee8e829a12f360030a9fd062.