Fix hard-coded id generator classes. Derp.