Remove junkfile and update naming for analytics event tracking