rename classes of Gillespie