changed names of classes/added new ones to prepare for the change to the job system