common/docker: undid Container methods back to Docker methods

- orchestrator: edits for naming consistency