Renamed methods.
Renamed fields.
Minor update in Worker tests.
Vars renamings.