remove 'job' notation
more naming changes