Also, rename a bunch of variable to not *shadow* the `opts` package name. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>