Fixing tracker namespace