Fix issue with duplicate entries in thv ls for some workloads (#1815)

Some parts of the code were mixing up container and workload names. In
some cases, this led to a workload appearing in `thv ls`, along with an
warning due to a failed migration being applied to the incorrect name.

Author: dmjb