Container name lookups to prefer IDs over names

Lookups of container names should prefer the ID over
names assigned to containers by users.

Signed-off-by: Eric Windisch <eric@windisch.us>
you meant `s/id/if/` :) (does not compile currently)