tidying naming in Track and tests