slight naming / organizational changes to ctl