Merge pull request #809 from baude/changevarlinkpath

finish changing the path for varlink

4 files changed, 897 insertions, 897 deletions

diff --git a/API.md b/API.md
index af48c10b1..ba569d59a 100755
--- a/API.md
+++ b/API.md
@@ -206,7 +206,7 @@ contains attributes like memory and cpu usage.  If the container cannot be found
 [ContainerNotFound](#ContainerNotFound)  error will be returned.
 #### Example
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
 {
   "container": {
     "block_input": 0,
@@ -288,7 +288,7 @@ arguements that represent ps options.  If the container cannot be found, a [Cont
 error will be returned.
 #### Example
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
 {
   "container": [
     "  UID   PID  PPID  C STIME TTY          TIME CMD",
@@ -324,7 +324,7 @@ method Ping() [StringResponse](#StringResponse)</div>
 Ping provides a response for developers to ensure their varlink setup is working.
 #### Example
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping
 {
   "ping": {
     "message": "OK"
@@ -339,7 +339,7 @@ PullImage pulls an image from a repository to local storage.  After the pull is
 is returned.
 #### Example
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
 {
   "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 }
@@ -360,7 +360,7 @@ container can be stopped and removed.  Upon sucessful removal of the container,
 container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned.
 #### Error
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
 {
   "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20"
 }
@@ -374,7 +374,7 @@ should be deleted.  If the image cannot be found, an [ImageNotFound](#ImageNotFo
 ID of the removed image is returned when complete.  See also [DeleteUnusedImages](DeleteUnusedImages).
 #### Example
 ~~~
-varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
+varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
 {
   "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 }
@@ -419,7 +419,7 @@ returns the container ID once stopped. If the container cannot be found, a [Cont
 error will be returned instead. See also [KillContainer](KillContainer).
 #### Error
 ~~~
-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
 {
   "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6"
 }
diff --git a/cmd/podman/varlink/io.projectatomic.podman.varlink b/cmd/podman/varlink/io.projectatomic.podman.varlink
index 3de9ecdf8..70879b46c 100644
--- a/cmd/podman/varlink/io.projectatomic.podman.varlink
+++ b/cmd/podman/varlink/io.projectatomic.podman.varlink
@@ -176,7 +176,7 @@ type PodmanInfo (
 # Ping provides a response for developers to ensure their varlink setup is working.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping
 # {
 #   "ping": {
 #     "message": "OK"
@@ -216,7 +216,7 @@ method InspectContainer(name: string) -> (container: string)
 # error will be returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
 # {
 #   "container": [
 #     "  UID   PID  PPID  C STIME TTY          TIME CMD",
@@ -250,7 +250,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string)
 # [ContainerNotFound](#ContainerNotFound)  error will be returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
 # {
 #   "container": {
 #     "block_input": 0,
@@ -283,7 +283,7 @@ method StartContainer() -> (notimplemented: NotImplemented)
 # error will be returned instead. See also [KillContainer](KillContainer).
 # #### Error
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
 # {
 #   "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6"
 # }
@@ -330,7 +330,7 @@ method WaitContainer(name: string) -> (exitcode: int)
 # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned.
 # #### Error
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
 # {
 #   "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20"
 # }
@@ -375,7 +375,7 @@ method TagImage(name: string, tagged: string) -> (image: string)
 # ID of the removed image is returned when complete.  See also [DeleteUnusedImages](DeleteUnusedImages).
 # #### Example
 # ~~~
-# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
+# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
 # {
 #   "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 # }
@@ -413,7 +413,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image:
 # is returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
 # {
 #   "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 # }
diff --git a/cmd/podman/varlink/ioprojectatomicpodman.go b/cmd/podman/varlink/ioprojectatomicpodman.go
index 174819538..51812f19f 100644
--- a/cmd/podman/varlink/ioprojectatomicpodman.go
+++ b/cmd/podman/varlink/ioprojectatomicpodman.go
@@ -4,6 +4,82 @@ package ioprojectatomicpodman
 import "github.com/varlink/go/varlink"
 
 // Type declarations
+type ContainerMount struct {
+	Destination string   `json:"destination"`
+	Type        string   `json:"type"`
+	Source      string   `json:"source"`
+	Options     []string `json:"options"`
+}
+
+type InfoStore struct {
+	Containers           int64           `json:"containers"`
+	Images               int64           `json:"images"`
+	Graph_driver_name    string          `json:"graph_driver_name"`
+	Graph_driver_options string          `json:"graph_driver_options"`
+	Graph_root           string          `json:"graph_root"`
+	Graph_status         InfoGraphStatus `json:"graph_status"`
+	Run_root             string          `json:"run_root"`
+}
+
+type PodmanInfo struct {
+	Host                InfoHost         `json:"host"`
+	Registries          []string         `json:"registries"`
+	Insecure_registries []string         `json:"insecure_registries"`
+	Store               InfoStore        `json:"store"`
+	Podman              InfoPodmanBinary `json:"podman"`
+}
+
+type Version struct {
+	Version    string `json:"version"`
+	Go_version string `json:"go_version"`
+	Git_commit string `json:"git_commit"`
+	Built      int64  `json:"built"`
+	Os_arch    string `json:"os_arch"`
+}
+
+type StringResponse struct {
+	Message string `json:"message"`
+}
+
+type ContainerChanges struct {
+	Changed []string `json:"changed"`
+	Added   []string `json:"added"`
+	Deleted []string `json:"deleted"`
+}
+
+type ListContainerData struct {
+	Id               string                  `json:"id"`
+	Image            string                  `json:"image"`
+	Imageid          string                  `json:"imageid"`
+	Command          []string                `json:"command"`
+	Createdat        string                  `json:"createdat"`
+	Runningfor       string                  `json:"runningfor"`
+	Status           string                  `json:"status"`
+	Ports            []ContainerPortMappings `json:"ports"`
+	Rootfssize       int64                   `json:"rootfssize"`
+	Rwsize           int64                   `json:"rwsize"`
+	Names            string                  `json:"names"`
+	Labels           map[string]string       `json:"labels"`
+	Mounts           []ContainerMount        `json:"mounts"`
+	Containerrunning bool                    `json:"containerrunning"`
+	Namespaces       ContainerNameSpace      `json:"namespaces"`
+}
+
+type InfoPodmanBinary struct {
+	Compiler       string `json:"compiler"`
+	Go_version     string `json:"go_version"`
+	Podman_version string `json:"podman_version"`
+	Git_commit     string `json:"git_commit"`
+}
+
+type ImageSearch struct {
+	Description  string `json:"description"`
+	Is_official  bool   `json:"is_official"`
+	Is_automated bool   `json:"is_automated"`
+	Name         string `json:"name"`
+	Star_count   int64  `json:"star_count"`
+}
+
 type ContainerStats struct {
 	Id           string  `json:"id"`
 	Name         string  `json:"name"`
@@ -20,22 +96,42 @@ type ContainerStats struct {
 	Pids         int64   `json:"pids"`
 }
 
+type ContainerPortMappings struct {
+	Host_port      string `json:"host_port"`
+	Host_ip        string `json:"host_ip"`
+	Protocol       string `json:"protocol"`
+	Container_port string `json:"container_port"`
+}
+
 type InfoGraphStatus struct {
 	Backing_filesystem  string `json:"backing_filesystem"`
 	Native_overlay_diff string `json:"native_overlay_diff"`
 	Supports_d_type     string `json:"supports_d_type"`
 }
 
-type PodmanInfo struct {
-	Host                InfoHost         `json:"host"`
-	Registries          []string         `json:"registries"`
-	Insecure_registries []string         `json:"insecure_registries"`
-	Store               InfoStore        `json:"store"`
-	Podman              InfoPodmanBinary `json:"podman"`
+type NotImplemented struct {
+	Comment string `json:"comment"`
 }
 
-type StringResponse struct {
-	Message string `json:"message"`
+type ImageInList struct {
+	Id          string            `json:"id"`
+	ParentId    string            `json:"parentId"`
+	RepoTags    []string          `json:"repoTags"`
+	RepoDigests []string          `json:"repoDigests"`
+	Created     string            `json:"created"`
+	Size        int64             `json:"size"`
+	VirtualSize int64             `json:"virtualSize"`
+	Containers  int64             `json:"containers"`
+	Labels      map[string]string `json:"labels"`
+}
+
+type ImageHistory struct {
+	Id        string   `json:"id"`
+	Created   string   `json:"created"`
+	CreatedBy string   `json:"createdBy"`
+	Tags      []string `json:"tags"`
+	Size      int64    `json:"size"`
+	Comment   string   `json:"comment"`
 }
 
 type ContainerNameSpace struct {
@@ -62,108 +158,12 @@ type InfoHost struct {
 	Uptime     string `json:"uptime"`
 }
 
-type ContainerChanges struct {
-	Changed []string `json:"changed"`
-	Added   []string `json:"added"`
-	Deleted []string `json:"deleted"`
-}
-
-type ImageInList struct {
-	Id          string            `json:"id"`
-	ParentId    string            `json:"parentId"`
-	RepoTags    []string          `json:"repoTags"`
-	RepoDigests []string          `json:"repoDigests"`
-	Created     string            `json:"created"`
-	Size        int64             `json:"size"`
-	VirtualSize int64             `json:"virtualSize"`
-	Containers  int64             `json:"containers"`
-	Labels      map[string]string `json:"labels"`
-}
-
-type ImageHistory struct {
-	Id        string   `json:"id"`
-	Created   string   `json:"created"`
-	CreatedBy string   `json:"createdBy"`
-	Tags      []string `json:"tags"`
-	Size      int64    `json:"size"`
-	Comment   string   `json:"comment"`
-}
-
-type ContainerMount struct {
-	Destination string   `json:"destination"`
-	Type        string   `json:"type"`
-	Source      string   `json:"source"`
-	Options     []string `json:"options"`
-}
-
-type ContainerPortMappings struct {
-	Host_port      string `json:"host_port"`
-	Host_ip        string `json:"host_ip"`
-	Protocol       string `json:"protocol"`
-	Container_port string `json:"container_port"`
-}
-
-type InfoPodmanBinary struct {
-	Compiler       string `json:"compiler"`
-	Go_version     string `json:"go_version"`
-	Podman_version string `json:"podman_version"`
-	Git_commit     string `json:"git_commit"`
-}
-
-type Version struct {
-	Version    string `json:"version"`
-	Go_version string `json:"go_version"`
-	Git_commit string `json:"git_commit"`
-	Built      int64  `json:"built"`
-	Os_arch    string `json:"os_arch"`
-}
-
-type ImageSearch struct {
-	Description  string `json:"description"`
-	Is_official  bool   `json:"is_official"`
-	Is_automated bool   `json:"is_automated"`
-	Name         string `json:"name"`
-	Star_count   int64  `json:"star_count"`
-}
-
-type ListContainerData struct {
-	Id               string                  `json:"id"`
-	Image            string                  `json:"image"`
-	Imageid          string                  `json:"imageid"`
-	Command          []string                `json:"command"`
-	Createdat        string                  `json:"createdat"`
-	Runningfor       string                  `json:"runningfor"`
-	Status           string                  `json:"status"`
-	Ports            []ContainerPortMappings `json:"ports"`
-	Rootfssize       int64                   `json:"rootfssize"`
-	Rwsize           int64                   `json:"rwsize"`
-	Names            string                  `json:"names"`
-	Labels           map[string]string       `json:"labels"`
-	Mounts           []ContainerMount        `json:"mounts"`
-	Containerrunning bool                    `json:"containerrunning"`
-	Namespaces       ContainerNameSpace      `json:"namespaces"`
-}
-
-type InfoStore struct {
-	Containers           int64           `json:"containers"`
-	Images               int64           `json:"images"`
-	Graph_driver_name    string          `json:"graph_driver_name"`
-	Graph_driver_options string          `json:"graph_driver_options"`
-	Graph_root           string          `json:"graph_root"`
-	Graph_status         InfoGraphStatus `json:"graph_status"`
-	Run_root             string          `json:"run_root"`
-}
-
-type NotImplemented struct {
-	Comment string `json:"comment"`
-}
-
 // Client method calls
-type AttachToContainer_methods struct{}
+type UpdateContainer_methods struct{}
 
-func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} }
+func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} }
 
-func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
@@ -172,8 +172,8 @@ func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_o
 	return
 }
 
-func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags)
+func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -190,68 +190,37 @@ func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (fu
 	}, nil
 }
 
-type WaitContainer_methods struct{}
+type InspectImage_methods struct{}
 
-func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} }
+func InspectImage() InspectImage_methods { return InspectImage_methods{} }
 
-func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) {
+func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) {
 	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	exitcode_out_, _, err_ = receive()
+	image_out_, _, err_ = receive()
 	return
 }
 
-func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) {
+func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
 		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags)
-	if err != nil {
-		return nil, err
-	}
-	return func() (exitcode_out_ int64, flags uint64, err error) {
-		var out struct {
-			Exitcode int64 `json:"exitcode"`
-		}
-		flags, err = receive(&out)
-		if err != nil {
-			return
-		}
-		exitcode_out_ = out.Exitcode
-		return
-	}, nil
-}
-
-type DeleteUnusedImages_methods struct{}
-
-func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} }
-
-func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) {
-	receive, err_ := m.Send(c, 0)
-	if err_ != nil {
-		return
-	}
-	images_out_, _, err_ = receive()
-	return
-}
-
-func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags)
+	receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (images_out_ []string, flags uint64, err error) {
+	return func() (image_out_ string, flags uint64, err error) {
 		var out struct {
-			Images []string `json:"images"`
+			Image string `json:"image"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		images_out_ = []string(out.Images)
+		image_out_ = out.Image
 		return
 	}, nil
 }
@@ -287,46 +256,42 @@ func (m GetInfo_methods) Send(c *varlink.Connection, flags uint64) (func() (Podm
 	}, nil
 }
 
-type GetContainer_methods struct{}
+type ResizeContainerTty_methods struct{}
 
-func GetContainer() GetContainer_methods { return GetContainer_methods{} }
+func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} }
 
-func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	notimplemented_out_, _, err_ = receive()
 	return
 }
 
-func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) {
-	var in struct {
-		Name string `json:"name"`
-	}
-	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags)
+func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ ListContainerData, flags uint64, err error) {
+	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
 		var out struct {
-			Container ListContainerData `json:"container"`
+			Notimplemented NotImplemented `json:"notimplemented"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		notimplemented_out_ = out.Notimplemented
 		return
 	}, nil
 }
 
-type CreateContainer_methods struct{}
+type StartContainer_methods struct{}
 
-func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} }
+func StartContainer() StartContainer_methods { return StartContainer_methods{} }
 
-func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
@@ -335,8 +300,8 @@ func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out
 	return
 }
 
-func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags)
+func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -353,12 +318,12 @@ func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func
 	}, nil
 }
 
-type ListContainerProcesses_methods struct{}
+type StopContainer_methods struct{}
 
-func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} }
+func StopContainer() StopContainer_methods { return StopContainer_methods{} }
 
-func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, opts_in_)
+func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, timeout_in_)
 	if err_ != nil {
 		return
 	}
@@ -366,277 +331,240 @@ func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ str
 	return
 }
 
-func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) {
+func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) {
 	var in struct {
-		Name string   `json:"name"`
-		Opts []string `json:"opts"`
+		Name    string `json:"name"`
+		Timeout int64  `json:"timeout"`
 	}
 	in.Name = name_in_
-	in.Opts = []string(opts_in_)
-	receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags)
+	in.Timeout = timeout_in_
+	receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ []string, flags uint64, err error) {
+	return func() (container_out_ string, flags uint64, err error) {
 		var out struct {
-			Container []string `json:"container"`
+			Container string `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = []string(out.Container)
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type ListImages_methods struct{}
+type AttachToContainer_methods struct{}
 
-func ListImages() ListImages_methods { return ListImages_methods{} }
+func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} }
 
-func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) {
+func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	images_out_, _, err_ = receive()
+	notimplemented_out_, _, err_ = receive()
 	return
 }
 
-func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags)
+func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (images_out_ []ImageInList, flags uint64, err error) {
+	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
 		var out struct {
-			Images []ImageInList `json:"images"`
+			Notimplemented NotImplemented `json:"notimplemented"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		images_out_ = []ImageInList(out.Images)
+		notimplemented_out_ = out.Notimplemented
 		return
 	}, nil
 }
 
-type TagImage_methods struct{}
+type BuildImage_methods struct{}
 
-func TagImage() TagImage_methods { return TagImage_methods{} }
+func BuildImage() BuildImage_methods { return BuildImage_methods{} }
 
-func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, tagged_in_)
+func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	image_out_, _, err_ = receive()
+	notimplemented_out_, _, err_ = receive()
 	return
 }
 
-func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) {
-	var in struct {
-		Name   string `json:"name"`
-		Tagged string `json:"tagged"`
-	}
-	in.Name = name_in_
-	in.Tagged = tagged_in_
-	receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags)
+func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (image_out_ string, flags uint64, err error) {
+	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
 		var out struct {
-			Image string `json:"image"`
+			Notimplemented NotImplemented `json:"notimplemented"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		image_out_ = out.Image
+		notimplemented_out_ = out.Notimplemented
 		return
 	}, nil
 }
 
-type ListContainerChanges_methods struct{}
+type CreateImage_methods struct{}
 
-func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} }
+func CreateImage() CreateImage_methods { return CreateImage_methods{} }
 
-func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	notimplemented_out_, _, err_ = receive()
 	return
 }
 
-func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) {
-	var in struct {
-		Name string `json:"name"`
-	}
-	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags)
+func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ ContainerChanges, flags uint64, err error) {
+	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
 		var out struct {
-			Container ContainerChanges `json:"container"`
+			Notimplemented NotImplemented `json:"notimplemented"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		notimplemented_out_ = out.Notimplemented
 		return
 	}, nil
 }
 
-type ExportContainer_methods struct{}
+type HistoryImage_methods struct{}
 
-func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} }
+func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} }
 
-func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, path_in_)
+func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	tarfile_out_, _, err_ = receive()
+	history_out_, _, err_ = receive()
 	return
 }
 
-func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) {
+func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) {
 	var in struct {
 		Name string `json:"name"`
-		Path string `json:"path"`
 	}
 	in.Name = name_in_
-	in.Path = path_in_
-	receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags)
-	if err != nil {
-		return nil, err
-	}
-	return func() (tarfile_out_ string, flags uint64, err error) {
-		var out struct {
-			Tarfile string `json:"tarfile"`
-		}
-		flags, err = receive(&out)
-		if err != nil {
-			return
-		}
-		tarfile_out_ = out.Tarfile
-		return
-	}, nil
-}
-
-type UpdateContainer_methods struct{}
-
-func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} }
-
-func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
-	receive, err_ := m.Send(c, 0)
-	if err_ != nil {
-		return
-	}
-	notimplemented_out_, _, err_ = receive()
-	return
-}
-
-func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags)
+	receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
+	return func() (history_out_ []ImageHistory, flags uint64, err error) {
 		var out struct {
-			Notimplemented NotImplemented `json:"notimplemented"`
+			History []ImageHistory `json:"history"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		notimplemented_out_ = out.Notimplemented
+		history_out_ = []ImageHistory(out.History)
 		return
 	}, nil
 }
 
-type UnpauseContainer_methods struct{}
+type Commit_methods struct{}
 
-func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} }
+func Commit() Commit_methods { return Commit_methods{} }
 
-func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	image_out_, _, err_ = receive()
 	return
 }
 
-func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
+func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) {
 	var in struct {
-		Name string `json:"name"`
+		Name       string   `json:"name"`
+		Image_name string   `json:"image_name"`
+		Changes    []string `json:"changes"`
+		Author     string   `json:"author"`
+		Message    string   `json:"message"`
+		Pause      bool     `json:"pause"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags)
+	in.Image_name = image_name_in_
+	in.Changes = []string(changes_in_)
+	in.Author = author_in_
+	in.Message = message_in_
+	in.Pause = pause_in_
+	receive, err := c.Send("io.projectatomic.podman.Commit", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ string, flags uint64, err error) {
+	return func() (image_out_ string, flags uint64, err error) {
 		var out struct {
-			Container string `json:"container"`
+			Image string `json:"image"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		image_out_ = out.Image
 		return
 	}, nil
 }
 
-type GetContainerStats_methods struct{}
+type ListContainers_methods struct{}
 
-func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} }
+func ListContainers() ListContainers_methods { return ListContainers_methods{} }
 
-func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	containers_out_, _, err_ = receive()
 	return
 }
 
-func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) {
-	var in struct {
-		Name string `json:"name"`
-	}
-	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags)
+func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ ContainerStats, flags uint64, err error) {
+	return func() (containers_out_ []ListContainerData, flags uint64, err error) {
 		var out struct {
-			Container ContainerStats `json:"container"`
+			Containers []ListContainerData `json:"containers"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		containers_out_ = []ListContainerData(out.Containers)
 		return
 	}, nil
 }
 
-type StopContainer_methods struct{}
+type GetContainer_methods struct{}
 
-func StopContainer() StopContainer_methods { return StopContainer_methods{} }
+func GetContainer() GetContainer_methods { return GetContainer_methods{} }
 
-func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, timeout_in_)
+func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
@@ -644,20 +572,18 @@ func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, time
 	return
 }
 
-func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) {
+func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) {
 	var in struct {
-		Name    string `json:"name"`
-		Timeout int64  `json:"timeout"`
+		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	in.Timeout = timeout_in_
-	receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ string, flags uint64, err error) {
+	return func() (container_out_ ListContainerData, flags uint64, err error) {
 		var out struct {
-			Container string `json:"container"`
+			Container ListContainerData `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
@@ -668,152 +594,146 @@ func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in
 	}, nil
 }
 
-type RestartContainer_methods struct{}
+type ExportContainer_methods struct{}
 
-func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} }
+func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} }
 
-func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, timeout_in_)
+func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, path_in_)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	tarfile_out_, _, err_ = receive()
 	return
 }
 
-func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) {
+func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
-		Name    string `json:"name"`
-		Timeout int64  `json:"timeout"`
+		Name string `json:"name"`
+		Path string `json:"path"`
 	}
 	in.Name = name_in_
-	in.Timeout = timeout_in_
-	receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags)
+	in.Path = path_in_
+	receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ string, flags uint64, err error) {
+	return func() (tarfile_out_ string, flags uint64, err error) {
 		var out struct {
-			Container string `json:"container"`
+			Tarfile string `json:"tarfile"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		tarfile_out_ = out.Tarfile
 		return
 	}, nil
 }
 
-type ImportImage_methods struct{}
+type ListImages_methods struct{}
 
-func ImportImage() ImportImage_methods { return ImportImage_methods{} }
+func ListImages() ListImages_methods { return ListImages_methods{} }
 
-func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_)
+func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	image_out_, _, err_ = receive()
+	images_out_, _, err_ = receive()
 	return
 }
 
-func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) {
-	var in struct {
-		Source    string   `json:"source"`
-		Reference string   `json:"reference"`
-		Message   string   `json:"message"`
-		Changes   []string `json:"changes"`
-	}
-	in.Source = source_in_
-	in.Reference = reference_in_
-	in.Message = message_in_
-	in.Changes = []string(changes_in_)
-	receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags)
+func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (image_out_ string, flags uint64, err error) {
+	return func() (images_out_ []ImageInList, flags uint64, err error) {
 		var out struct {
-			Image string `json:"image"`
+			Images []ImageInList `json:"images"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		image_out_ = out.Image
+		images_out_ = []ImageInList(out.Images)
 		return
 	}, nil
 }
 
-type ListContainers_methods struct{}
+type DeleteUnusedImages_methods struct{}
 
-func ListContainers() ListContainers_methods { return ListContainers_methods{} }
+func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} }
 
-func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) {
+func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	containers_out_, _, err_ = receive()
+	images_out_, _, err_ = receive()
 	return
 }
 
-func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags)
+func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (containers_out_ []ListContainerData, flags uint64, err error) {
+	return func() (images_out_ []string, flags uint64, err error) {
 		var out struct {
-			Containers []ListContainerData `json:"containers"`
+			Images []string `json:"images"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		containers_out_ = []ListContainerData(out.Containers)
+		images_out_ = []string(out.Images)
 		return
 	}, nil
 }
 
-type StartContainer_methods struct{}
+type GetContainerStats_methods struct{}
 
-func StartContainer() StartContainer_methods { return StartContainer_methods{} }
+func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} }
 
-func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
-	receive, err_ := m.Send(c, 0)
+func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	notimplemented_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags)
+func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) {
+	var in struct {
+		Name string `json:"name"`
+	}
+	in.Name = name_in_
+	receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
+	return func() (container_out_ ContainerStats, flags uint64, err error) {
 		var out struct {
-			Notimplemented NotImplemented `json:"notimplemented"`
+			Container ContainerStats `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		notimplemented_out_ = out.Notimplemented
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type RemoveContainer_methods struct{}
+type UnpauseContainer_methods struct{}
 
-func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} }
+func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} }
 
-func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, force_in_)
+func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
@@ -821,14 +741,12 @@ func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, fo
 	return
 }
 
-func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) {
+func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
-		Name  string `json:"name"`
-		Force bool   `json:"force"`
+		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	in.Force = force_in_
-	receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -845,110 +763,108 @@ func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_
 	}, nil
 }
 
-type DeleteStoppedContainers_methods struct{}
+type PullImage_methods struct{}
 
-func DeleteStoppedContainers() DeleteStoppedContainers_methods {
-	return DeleteStoppedContainers_methods{}
-}
+func PullImage() PullImage_methods { return PullImage_methods{} }
 
-func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) {
-	receive, err_ := m.Send(c, 0)
+func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	containers_out_, _, err_ = receive()
+	id_out_, _, err_ = receive()
 	return
 }
 
-func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags)
+func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
+	var in struct {
+		Name string `json:"name"`
+	}
+	in.Name = name_in_
+	receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (containers_out_ []string, flags uint64, err error) {
+	return func() (id_out_ string, flags uint64, err error) {
 		var out struct {
-			Containers []string `json:"containers"`
+			Id string `json:"id"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		containers_out_ = []string(out.Containers)
+		id_out_ = out.Id
 		return
 	}, nil
 }
 
-type InspectContainer_methods struct{}
+type Ping_methods struct{}
 
-func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} }
+func Ping() Ping_methods { return Ping_methods{} }
 
-func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	ping_out_, _, err_ = receive()
 	return
 }
 
-func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
-	var in struct {
-		Name string `json:"name"`
-	}
-	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags)
+func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ string, flags uint64, err error) {
+	return func() (ping_out_ StringResponse, flags uint64, err error) {
 		var out struct {
-			Container string `json:"container"`
+			Ping StringResponse `json:"ping"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		ping_out_ = out.Ping
 		return
 	}, nil
 }
 
-type RenameContainer_methods struct{}
+type GetVersion_methods struct{}
 
-func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} }
+func GetVersion() GetVersion_methods { return GetVersion_methods{} }
 
-func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	notimplemented_out_, _, err_ = receive()
+	version_out_, _, err_ = receive()
 	return
 }
 
-func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags)
+func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
+	return func() (version_out_ Version, flags uint64, err error) {
 		var out struct {
-			Notimplemented NotImplemented `json:"notimplemented"`
+			Version Version `json:"version"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		notimplemented_out_ = out.Notimplemented
+		version_out_ = out.Version
 		return
 	}, nil
 }
 
-type BuildImage_methods struct{}
+type CreateContainer_methods struct{}
 
-func BuildImage() BuildImage_methods { return BuildImage_methods{} }
+func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} }
 
-func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
@@ -957,8 +873,8 @@ func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ Not
 	return
 }
 
-func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags)
+func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -975,113 +891,123 @@ func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (N
 	}, nil
 }
 
-type PullImage_methods struct{}
+type KillContainer_methods struct{}
 
-func PullImage() PullImage_methods { return PullImage_methods{} }
+func KillContainer() KillContainer_methods { return KillContainer_methods{} }
 
-func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, signal_in_)
 	if err_ != nil {
 		return
 	}
-	id_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
+func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) {
 	var in struct {
-		Name string `json:"name"`
+		Name   string `json:"name"`
+		Signal int64  `json:"signal"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags)
+	in.Signal = signal_in_
+	receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (id_out_ string, flags uint64, err error) {
+	return func() (container_out_ string, flags uint64, err error) {
 		var out struct {
-			Id string `json:"id"`
+			Container string `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		id_out_ = out.Id
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type Ping_methods struct{}
+type RemoveContainer_methods struct{}
 
-func Ping() Ping_methods { return Ping_methods{} }
+func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} }
 
-func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) {
-	receive, err_ := m.Send(c, 0)
+func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, force_in_)
 	if err_ != nil {
 		return
 	}
-	ping_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags)
+func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) {
+	var in struct {
+		Name  string `json:"name"`
+		Force bool   `json:"force"`
+	}
+	in.Name = name_in_
+	in.Force = force_in_
+	receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (ping_out_ StringResponse, flags uint64, err error) {
+	return func() (container_out_ string, flags uint64, err error) {
 		var out struct {
-			Ping StringResponse `json:"ping"`
+			Container string `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		ping_out_ = out.Ping
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type PauseContainer_methods struct{}
+type RemoveImage_methods struct{}
 
-func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} }
+func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} }
 
-func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, force_in_)
 	if err_ != nil {
 		return
 	}
-	container_out_, _, err_ = receive()
+	image_out_, _, err_ = receive()
 	return
 }
 
-func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
+func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) {
 	var in struct {
-		Name string `json:"name"`
+		Name  string `json:"name"`
+		Force bool   `json:"force"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags)
+	in.Force = force_in_
+	receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (container_out_ string, flags uint64, err error) {
+	return func() (image_out_ string, flags uint64, err error) {
 		var out struct {
-			Container string `json:"container"`
+			Image string `json:"image"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		container_out_ = out.Container
+		image_out_ = out.Image
 		return
 	}, nil
 }
 
-type PushImage_methods struct{}
+type ImportImage_methods struct{}
 
-func PushImage() PushImage_methods { return PushImage_methods{} }
+func ImportImage() ImportImage_methods { return ImportImage_methods{} }
 
-func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_)
+func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_)
 	if err_ != nil {
 		return
 	}
@@ -1089,16 +1015,18 @@ func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_
 	return
 }
 
-func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) {
+func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) {
 	var in struct {
-		Name      string `json:"name"`
-		Tag       string `json:"tag"`
-		Tlsverify bool   `json:"tlsverify"`
+		Source    string   `json:"source"`
+		Reference string   `json:"reference"`
+		Message   string   `json:"message"`
+		Changes   []string `json:"changes"`
 	}
-	in.Name = name_in_
-	in.Tag = tag_in_
-	in.Tlsverify = tlsverify_in_
-	receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags)
+	in.Source = source_in_
+	in.Reference = reference_in_
+	in.Message = message_in_
+	in.Changes = []string(changes_in_)
+	receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -1154,114 +1082,153 @@ func (m ExportImage_methods) Send(c *varlink.Connection, flags uint64, name_in_
 	}, nil
 }
 
-type InspectImage_methods struct{}
+type InspectContainer_methods struct{}
 
-func InspectImage() InspectImage_methods { return InspectImage_methods{} }
+func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} }
 
-func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) {
+func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
 	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	image_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
+func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
 		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (image_out_ string, flags uint64, err error) {
+	return func() (container_out_ string, flags uint64, err error) {
 		var out struct {
-			Image string `json:"image"`
+			Container string `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		image_out_ = out.Image
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type RemoveImage_methods struct{}
+type GetContainerLogs_methods struct{}
 
-func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} }
+func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} }
 
-func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, force_in_)
+func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	image_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) {
+func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) {
 	var in struct {
-		Name  string `json:"name"`
-		Force bool   `json:"force"`
+		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	in.Force = force_in_
-	receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (image_out_ string, flags uint64, err error) {
+	return func() (container_out_ []string, flags uint64, err error) {
 		var out struct {
-			Image string `json:"image"`
+			Container []string `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		image_out_ = out.Image
+		container_out_ = []string(out.Container)
 		return
 	}, nil
 }
 
-type GetVersion_methods struct{}
+type ListContainerChanges_methods struct{}
 
-func GetVersion() GetVersion_methods { return GetVersion_methods{} }
+func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} }
 
-func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) {
-	receive, err_ := m.Send(c, 0)
+func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	version_out_, _, err_ = receive()
+	container_out_, _, err_ = receive()
 	return
 }
 
-func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags)
+func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) {
+	var in struct {
+		Name string `json:"name"`
+	}
+	in.Name = name_in_
+	receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (version_out_ Version, flags uint64, err error) {
+	return func() (container_out_ ContainerChanges, flags uint64, err error) {
 		var out struct {
-			Version Version `json:"version"`
+			Container ContainerChanges `json:"container"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		version_out_ = out.Version
+		container_out_ = out.Container
 		return
 	}, nil
 }
 
-type ResizeContainerTty_methods struct{}
+type RestartContainer_methods struct{}
 
-func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} }
+func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} }
 
-func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
+func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, timeout_in_)
+	if err_ != nil {
+		return
+	}
+	container_out_, _, err_ = receive()
+	return
+}
+
+func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) {
+	var in struct {
+		Name    string `json:"name"`
+		Timeout int64  `json:"timeout"`
+	}
+	in.Name = name_in_
+	in.Timeout = timeout_in_
+	receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags)
+	if err != nil {
+		return nil, err
+	}
+	return func() (container_out_ string, flags uint64, err error) {
+		var out struct {
+			Container string `json:"container"`
+		}
+		flags, err = receive(&out)
+		if err != nil {
+			return
+		}
+		container_out_ = out.Container
+		return
+	}, nil
+}
+
+type RenameContainer_methods struct{}
+
+func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} }
+
+func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
 	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
@@ -1270,8 +1237,8 @@ func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_
 	return
 }
 
-func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags)
+func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -1288,12 +1255,12 @@ func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (f
 	}, nil
 }
 
-type KillContainer_methods struct{}
+type PauseContainer_methods struct{}
 
-func KillContainer() KillContainer_methods { return KillContainer_methods{} }
+func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} }
 
-func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, signal_in_)
+func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
@@ -1301,14 +1268,12 @@ func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, sign
 	return
 }
 
-func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) {
+func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
-		Name   string `json:"name"`
-		Signal int64  `json:"signal"`
+		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	in.Signal = signal_in_
-	receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -1325,43 +1290,51 @@ func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in
 	}, nil
 }
 
-type CreateImage_methods struct{}
+type PushImage_methods struct{}
 
-func CreateImage() CreateImage_methods { return CreateImage_methods{} }
+func PushImage() PushImage_methods { return PushImage_methods{} }
 
-func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) {
-	receive, err_ := m.Send(c, 0)
+func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_)
 	if err_ != nil {
 		return
 	}
-	notimplemented_out_, _, err_ = receive()
+	image_out_, _, err_ = receive()
 	return
 }
 
-func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) {
-	receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags)
+func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) {
+	var in struct {
+		Name      string `json:"name"`
+		Tag       string `json:"tag"`
+		Tlsverify bool   `json:"tlsverify"`
+	}
+	in.Name = name_in_
+	in.Tag = tag_in_
+	in.Tlsverify = tlsverify_in_
+	receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (notimplemented_out_ NotImplemented, flags uint64, err error) {
+	return func() (image_out_ string, flags uint64, err error) {
 		var out struct {
-			Notimplemented NotImplemented `json:"notimplemented"`
+			Image string `json:"image"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		notimplemented_out_ = out.Notimplemented
+		image_out_ = out.Image
 		return
 	}, nil
 }
 
-type GetContainerLogs_methods struct{}
+type ListContainerProcesses_methods struct{}
 
-func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} }
+func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} }
 
-func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_)
+func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, opts_in_)
 	if err_ != nil {
 		return
 	}
@@ -1369,12 +1342,14 @@ func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (
 	return
 }
 
-func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) {
+func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) {
 	var in struct {
-		Name string `json:"name"`
+		Name string   `json:"name"`
+		Opts []string `json:"opts"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags)
+	in.Opts = []string(opts_in_)
+	receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -1391,84 +1366,80 @@ func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name
 	}, nil
 }
 
-type HistoryImage_methods struct{}
+type WaitContainer_methods struct{}
 
-func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} }
+func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} }
 
-func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) {
+func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) {
 	receive, err_ := m.Send(c, 0, name_in_)
 	if err_ != nil {
 		return
 	}
-	history_out_, _, err_ = receive()
+	exitcode_out_, _, err_ = receive()
 	return
 }
 
-func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) {
+func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) {
 	var in struct {
 		Name string `json:"name"`
 	}
 	in.Name = name_in_
-	receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags)
+	receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (history_out_ []ImageHistory, flags uint64, err error) {
+	return func() (exitcode_out_ int64, flags uint64, err error) {
 		var out struct {
-			History []ImageHistory `json:"history"`
+			Exitcode int64 `json:"exitcode"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		history_out_ = []ImageHistory(out.History)
+		exitcode_out_ = out.Exitcode
 		return
 	}, nil
 }
 
-type SearchImage_methods struct{}
+type DeleteStoppedContainers_methods struct{}
 
-func SearchImage() SearchImage_methods { return SearchImage_methods{} }
+func DeleteStoppedContainers() DeleteStoppedContainers_methods {
+	return DeleteStoppedContainers_methods{}
+}
 
-func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, limit_in_)
+func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) {
+	receive, err_ := m.Send(c, 0)
 	if err_ != nil {
 		return
 	}
-	images_out_, _, err_ = receive()
+	containers_out_, _, err_ = receive()
 	return
 }
 
-func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) {
-	var in struct {
-		Name  string `json:"name"`
-		Limit int64  `json:"limit"`
-	}
-	in.Name = name_in_
-	in.Limit = limit_in_
-	receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags)
+func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) {
+	receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags)
 	if err != nil {
 		return nil, err
 	}
-	return func() (images_out_ []ImageSearch, flags uint64, err error) {
+	return func() (containers_out_ []string, flags uint64, err error) {
 		var out struct {
-			Images []ImageSearch `json:"images"`
+			Containers []string `json:"containers"`
 		}
 		flags, err = receive(&out)
 		if err != nil {
 			return
 		}
-		images_out_ = []ImageSearch(out.Images)
+		containers_out_ = []string(out.Containers)
 		return
 	}, nil
 }
 
-type Commit_methods struct{}
+type TagImage_methods struct{}
 
-func Commit() Commit_methods { return Commit_methods{} }
+func TagImage() TagImage_methods { return TagImage_methods{} }
 
-func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) {
-	receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_)
+func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, tagged_in_)
 	if err_ != nil {
 		return
 	}
@@ -1476,22 +1447,14 @@ func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_
 	return
 }
 
-func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) {
+func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) {
 	var in struct {
-		Name       string   `json:"name"`
-		Image_name string   `json:"image_name"`
-		Changes    []string `json:"changes"`
-		Author     string   `json:"author"`
-		Message    string   `json:"message"`
-		Pause      bool     `json:"pause"`
+		Name   string `json:"name"`
+		Tagged string `json:"tagged"`
 	}
 	in.Name = name_in_
-	in.Image_name = image_name_in_
-	in.Changes = []string(changes_in_)
-	in.Author = author_in_
-	in.Message = message_in_
-	in.Pause = pause_in_
-	receive, err := c.Send("io.projectatomic.podman.Commit", in, flags)
+	in.Tagged = tagged_in_
+	receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags)
 	if err != nil {
 		return nil, err
 	}
@@ -1508,61 +1471,90 @@ func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ strin
 	}, nil
 }
 
+type SearchImage_methods struct{}
+
+func SearchImage() SearchImage_methods { return SearchImage_methods{} }
+
+func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) {
+	receive, err_ := m.Send(c, 0, name_in_, limit_in_)
+	if err_ != nil {
+		return
+	}
+	images_out_, _, err_ = receive()
+	return
+}
+
+func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) {
+	var in struct {
+		Name  string `json:"name"`
+		Limit int64  `json:"limit"`
+	}
+	in.Name = name_in_
+	in.Limit = limit_in_
+	receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags)
+	if err != nil {
+		return nil, err
+	}
+	return func() (images_out_ []ImageSearch, flags uint64, err error) {
+		var out struct {
+			Images []ImageSearch `json:"images"`
+		}
+		flags, err = receive(&out)
+		if err != nil {
+			return
+		}
+		images_out_ = []ImageSearch(out.Images)
+		return
+	}, nil
+}
+
 // Service interface with all methods
 type ioprojectatomicpodmanInterface interface {
 	GetContainerStats(c VarlinkCall, name_ string) error
-	StopContainer(c VarlinkCall, name_ string, timeout_ int64) error
-	RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error
-	ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error
-	ListContainers(c VarlinkCall) error
-	StartContainer(c VarlinkCall) error
+	UnpauseContainer(c VarlinkCall, name_ string) error
+	PullImage(c VarlinkCall, name_ string) error
+	ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error
+	Ping(c VarlinkCall) error
+	GetVersion(c VarlinkCall) error
+	CreateContainer(c VarlinkCall) error
+	KillContainer(c VarlinkCall, name_ string, signal_ int64) error
 	RemoveContainer(c VarlinkCall, name_ string, force_ bool) error
-	DeleteStoppedContainers(c VarlinkCall) error
+	RemoveImage(c VarlinkCall, name_ string, force_ bool) error
+	ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error
 	InspectContainer(c VarlinkCall, name_ string) error
+	GetContainerLogs(c VarlinkCall, name_ string) error
+	ListContainerChanges(c VarlinkCall, name_ string) error
+	RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error
 	RenameContainer(c VarlinkCall) error
-	BuildImage(c VarlinkCall) error
-	Ping(c VarlinkCall) error
 	PauseContainer(c VarlinkCall, name_ string) error
 	PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error
-	ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error
-	PullImage(c VarlinkCall, name_ string) error
-	RemoveImage(c VarlinkCall, name_ string, force_ bool) error
-	GetVersion(c VarlinkCall) error
-	ResizeContainerTty(c VarlinkCall) error
-	KillContainer(c VarlinkCall, name_ string, signal_ int64) error
-	CreateImage(c VarlinkCall) error
+	ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error
+	WaitContainer(c VarlinkCall, name_ string) error
+	DeleteStoppedContainers(c VarlinkCall) error
+	TagImage(c VarlinkCall, name_ string, tagged_ string) error
+	SearchImage(c VarlinkCall, name_ string, limit_ int64) error
+	UpdateContainer(c VarlinkCall) error
 	InspectImage(c VarlinkCall, name_ string) error
-	GetContainerLogs(c VarlinkCall, name_ string) error
 	HistoryImage(c VarlinkCall, name_ string) error
-	SearchImage(c VarlinkCall, name_ string, limit_ int64) error
-	Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error
-	WaitContainer(c VarlinkCall, name_ string) error
-	DeleteUnusedImages(c VarlinkCall) error
 	GetInfo(c VarlinkCall) error
-	GetContainer(c VarlinkCall, name_ string) error
-	CreateContainer(c VarlinkCall) error
-	ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error
+	ResizeContainerTty(c VarlinkCall) error
+	StartContainer(c VarlinkCall) error
+	StopContainer(c VarlinkCall, name_ string, timeout_ int64) error
 	AttachToContainer(c VarlinkCall) error
-	TagImage(c VarlinkCall, name_ string, tagged_ string) error
-	ListContainerChanges(c VarlinkCall, name_ string) error
+	BuildImage(c VarlinkCall) error
+	CreateImage(c VarlinkCall) error
+	Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error
+	ListContainers(c VarlinkCall) error
+	GetContainer(c VarlinkCall, name_ string) error
 	ExportContainer(c VarlinkCall, name_ string, path_ string) error
-	UpdateContainer(c VarlinkCall) error
-	UnpauseContainer(c VarlinkCall, name_ string) error
 	ListImages(c VarlinkCall) error
+	DeleteUnusedImages(c VarlinkCall) error
 }
 
 // Service object with all methods
 type VarlinkCall struct{ varlink.Call }
 
 // Reply methods for all varlink errors
-func (c *VarlinkCall) ReplyImageNotFound(name_ string) error {
-	var out struct {
-		Name string `json:"name"`
-	}
-	out.Name = name_
-	return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out)
-}
-
 func (c *VarlinkCall) ReplyContainerNotFound(name_ string) error {
 	var out struct {
 		Name string `json:"name"`
@@ -1587,32 +1579,40 @@ func (c *VarlinkCall) ReplyRuntimeError(reason_ string) error {
 	return c.ReplyError("io.projectatomic.podman.RuntimeError", &out)
 }
 
+func (c *VarlinkCall) ReplyImageNotFound(name_ string) error {
+	var out struct {
+		Name string `json:"name"`
+	}
+	out.Name = name_
+	return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out)
+}
+
 // Reply methods for all varlink methods
-func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error {
+func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error {
 	var out struct {
-		Container ContainerStats `json:"container"`
+		Container []string `json:"container"`
 	}
-	out.Container = container_
+	out.Container = []string(container_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyStopContainer(container_ string) error {
+func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error {
 	var out struct {
-		Container string `json:"container"`
+		Exitcode int64 `json:"exitcode"`
 	}
-	out.Container = container_
+	out.Exitcode = exitcode_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyRestartContainer(container_ string) error {
+func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error {
 	var out struct {
-		Container string `json:"container"`
+		Containers []string `json:"containers"`
 	}
-	out.Container = container_
+	out.Containers = []string(containers_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyImportImage(image_ string) error {
+func (c *VarlinkCall) ReplyTagImage(image_ string) error {
 	var out struct {
 		Image string `json:"image"`
 	}
@@ -1620,15 +1620,15 @@ func (c *VarlinkCall) ReplyImportImage(image_ string) error {
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error {
+func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error {
 	var out struct {
-		Containers []ListContainerData `json:"containers"`
+		Images []ImageSearch `json:"images"`
 	}
-	out.Containers = []ListContainerData(containers_)
+	out.Images = []ImageSearch(images_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1636,31 +1636,31 @@ func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error {
+func (c *VarlinkCall) ReplyInspectImage(image_ string) error {
 	var out struct {
-		Container string `json:"container"`
+		Image string `json:"image"`
 	}
-	out.Container = container_
+	out.Image = image_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error {
+func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error {
 	var out struct {
-		Containers []string `json:"containers"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Containers = []string(containers_)
+	out.Notimplemented = notimplemented_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyInspectContainer(container_ string) error {
+func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error {
 	var out struct {
-		Container string `json:"container"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Container = container_
+	out.Notimplemented = notimplemented_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1668,127 +1668,127 @@ func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		History []ImageHistory `json:"history"`
 	}
-	out.Notimplemented = notimplemented_
+	out.History = []ImageHistory(history_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error {
+func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error {
 	var out struct {
-		Ping StringResponse `json:"ping"`
+		Info PodmanInfo `json:"info"`
 	}
-	out.Ping = ping_
+	out.Info = info_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyPauseContainer(container_ string) error {
+func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error {
 	var out struct {
-		Container string `json:"container"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Container = container_
+	out.Notimplemented = notimplemented_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyPushImage(image_ string) error {
+func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error {
 	var out struct {
-		Image string `json:"image"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Image = image_
+	out.Notimplemented = notimplemented_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyExportImage(image_ string) error {
+func (c *VarlinkCall) ReplyStopContainer(container_ string) error {
 	var out struct {
-		Image string `json:"image"`
+		Container string `json:"container"`
 	}
-	out.Image = image_
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyPullImage(id_ string) error {
+func (c *VarlinkCall) ReplyCommit(image_ string) error {
 	var out struct {
-		Id string `json:"id"`
+		Image string `json:"image"`
 	}
-	out.Id = id_
+	out.Image = image_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyGetVersion(version_ Version) error {
+func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error {
 	var out struct {
-		Version Version `json:"version"`
+		Images []string `json:"images"`
 	}
-	out.Version = version_
+	out.Images = []string(images_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Containers []ListContainerData `json:"containers"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Containers = []ListContainerData(containers_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyKillContainer(container_ string) error {
+func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error {
 	var out struct {
-		Container string `json:"container"`
+		Container ListContainerData `json:"container"`
 	}
 	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Tarfile string `json:"tarfile"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Tarfile = tarfile_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyInspectImage(image_ string) error {
+func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error {
 	var out struct {
-		Image string `json:"image"`
+		Images []ImageInList `json:"images"`
 	}
-	out.Image = image_
+	out.Images = []ImageInList(images_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyRemoveImage(image_ string) error {
+func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error {
 	var out struct {
-		Image string `json:"image"`
+		Container ContainerStats `json:"container"`
 	}
-	out.Image = image_
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error {
+func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error {
 	var out struct {
-		Container []string `json:"container"`
+		Container string `json:"container"`
 	}
-	out.Container = []string(container_)
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error {
+func (c *VarlinkCall) ReplyPullImage(id_ string) error {
 	var out struct {
-		History []ImageHistory `json:"history"`
+		Id string `json:"id"`
 	}
-	out.History = []ImageHistory(history_)
+	out.Id = id_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error {
+func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error {
 	var out struct {
-		Images []ImageSearch `json:"images"`
+		Container string `json:"container"`
 	}
-	out.Images = []ImageSearch(images_)
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyCommit(image_ string) error {
+func (c *VarlinkCall) ReplyRemoveImage(image_ string) error {
 	var out struct {
 		Image string `json:"image"`
 	}
@@ -1796,39 +1796,39 @@ func (c *VarlinkCall) ReplyCommit(image_ string) error {
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error {
+func (c *VarlinkCall) ReplyImportImage(image_ string) error {
 	var out struct {
-		Info PodmanInfo `json:"info"`
+		Image string `json:"image"`
 	}
-	out.Info = info_
+	out.Image = image_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error {
+func (c *VarlinkCall) ReplyExportImage(image_ string) error {
 	var out struct {
-		Container ListContainerData `json:"container"`
+		Image string `json:"image"`
 	}
-	out.Container = container_
+	out.Image = image_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Ping StringResponse `json:"ping"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Ping = ping_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error {
+func (c *VarlinkCall) ReplyGetVersion(version_ Version) error {
 	var out struct {
-		Container []string `json:"container"`
+		Version Version `json:"version"`
 	}
-	out.Container = []string(container_)
+	out.Version = version_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1836,261 +1836,268 @@ func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) err
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error {
+func (c *VarlinkCall) ReplyKillContainer(container_ string) error {
 	var out struct {
-		Exitcode int64 `json:"exitcode"`
+		Container string `json:"container"`
 	}
-	out.Exitcode = exitcode_
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error {
+func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error {
 	var out struct {
-		Images []string `json:"images"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Images = []string(images_)
+	out.Notimplemented = notimplemented_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error {
+func (c *VarlinkCall) ReplyPauseContainer(container_ string) error {
 	var out struct {
-		Container ContainerChanges `json:"container"`
+		Container string `json:"container"`
 	}
 	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error {
+func (c *VarlinkCall) ReplyPushImage(image_ string) error {
 	var out struct {
-		Tarfile string `json:"tarfile"`
+		Image string `json:"image"`
 	}
-	out.Tarfile = tarfile_
+	out.Image = image_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error {
+func (c *VarlinkCall) ReplyInspectContainer(container_ string) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Container string `json:"container"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error {
+func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error {
 	var out struct {
-		Container string `json:"container"`
+		Container []string `json:"container"`
 	}
-	out.Container = container_
+	out.Container = []string(container_)
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error {
+func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error {
 	var out struct {
-		Images []ImageInList `json:"images"`
+		Container ContainerChanges `json:"container"`
 	}
-	out.Images = []ImageInList(images_)
+	out.Container = container_
 	return c.Reply(&out)
 }
 
-func (c *VarlinkCall) ReplyTagImage(image_ string) error {
+func (c *VarlinkCall) ReplyRestartContainer(container_ string) error {
 	var out struct {
-		Image string `json:"image"`
+		Container string `json:"container"`
 	}
-	out.Image = image_
+	out.Container = container_
 	return c.Reply(&out)
 }
 
 // Dummy implementations for all varlink methods
-func (s *VarlinkInterface) Ping(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping")
+func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer")
 }
 
-func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer")
+func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage")
 }
 
-func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage")
+func (s *VarlinkInterface) GetInfo(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo")
 }
 
-func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage")
+func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty")
 }
 
-func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage")
+func (s *VarlinkInterface) StartContainer(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer")
 }
 
-func (s *VarlinkInterface) GetVersion(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion")
+func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer")
 }
 
-func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty")
+func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer")
 }
 
-func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer")
+func (s *VarlinkInterface) BuildImage(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage")
 }
 
 func (s *VarlinkInterface) CreateImage(c VarlinkCall) error {
 	return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateImage")
 }
 
-func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage")
+func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage")
 }
 
-func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage")
+func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit")
 }
 
-func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs")
+func (s *VarlinkInterface) ListContainers(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers")
 }
 
-func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage")
+func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer")
 }
 
-func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage")
+func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer")
 }
 
-func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit")
+func (s *VarlinkInterface) ListImages(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages")
 }
 
-func (s *VarlinkInterface) GetInfo(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo")
+func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages")
 }
 
-func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer")
+func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats")
 }
 
-func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer")
+func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer")
 }
 
-func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses")
+func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage")
 }
 
-func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer")
+func (s *VarlinkInterface) Ping(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping")
 }
 
-func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer")
+func (s *VarlinkInterface) GetVersion(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion")
 }
 
-func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages")
+func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer")
 }
 
-func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges")
+func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer")
 }
 
-func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer")
+func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer")
 }
 
-func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer")
+func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage")
 }
 
-func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer")
+func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage")
 }
 
-func (s *VarlinkInterface) ListImages(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages")
+func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage")
 }
 
-func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage")
+func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer")
 }
 
-func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats")
+func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs")
 }
 
-func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer")
+func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges")
 }
 
 func (s *VarlinkInterface) RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error {
 	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RestartContainer")
 }
 
-func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage")
+func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer")
 }
 
-func (s *VarlinkInterface) ListContainers(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers")
+func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer")
 }
 
-func (s *VarlinkInterface) StartContainer(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer")
+func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage")
 }
 
-func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer")
+func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses")
 }
 
-func (s *VarlinkInterface) DeleteStoppedContainers(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteStoppedContainers")
+func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer")
 }
 
-func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer")
+func (s *VarlinkInterface) DeleteStoppedContainers(c VarlinkCall) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteStoppedContainers")
 }
 
-func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer")
+func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage")
 }
 
-func (s *VarlinkInterface) BuildImage(c VarlinkCall) error {
-	return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage")
+func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error {
+	return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage")
 }
 
 // Method call dispatcher
 func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) error {
 	switch methodname {
-	case "GetContainerStats":
+	case "GetVersion":
+		return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call})
+
+	case "CreateContainer":
+		return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call})
+
+	case "KillContainer":
 		var in struct {
-			Name string `json:"name"`
+			Name   string `json:"name"`
+			Signal int64  `json:"signal"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal)
 
-	case "StopContainer":
+	case "RemoveContainer":
 		var in struct {
-			Name    string `json:"name"`
-			Timeout int64  `json:"timeout"`
+			Name  string `json:"name"`
+			Force bool   `json:"force"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout)
+		return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force)
 
-	case "RestartContainer":
+	case "RemoveImage":
 		var in struct {
-			Name    string `json:"name"`
-			Timeout int64  `json:"timeout"`
+			Name  string `json:"name"`
+			Force bool   `json:"force"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout)
+		return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force)
 
 	case "ImportImage":
 		var in struct {
@@ -2105,27 +2112,22 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		}
 		return s.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call}, in.Source, in.Reference, in.Message, []string(in.Changes))
 
-	case "ListContainers":
-		return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call})
-
-	case "StartContainer":
-		return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call})
-
-	case "RemoveContainer":
+	case "ExportImage":
 		var in struct {
-			Name  string `json:"name"`
-			Force bool   `json:"force"`
+			Name        string `json:"name"`
+			Destination string `json:"destination"`
+			Compress    bool   `json:"compress"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force)
+		return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress)
 
-	case "DeleteStoppedContainers":
-		return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call})
+	case "Ping":
+		return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call})
 
-	case "InspectContainer":
+	case "GetContainerLogs":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2133,15 +2135,9 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name)
-
-	case "RenameContainer":
-		return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call})
-
-	case "BuildImage":
-		return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call})
+		return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name)
 
-	case "PullImage":
+	case "ListContainerChanges":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2149,10 +2145,21 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name)
 
-	case "Ping":
-		return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call})
+	case "RestartContainer":
+		var in struct {
+			Name    string `json:"name"`
+			Timeout int64  `json:"timeout"`
+		}
+		err := call.GetParameters(&in)
+		if err != nil {
+			return call.ReplyInvalidParameter("parameters")
+		}
+		return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout)
+
+	case "RenameContainer":
+		return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call})
 
 	case "PauseContainer":
 		var in struct {
@@ -2176,19 +2183,17 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		}
 		return s.ioprojectatomicpodmanInterface.PushImage(VarlinkCall{call}, in.Name, in.Tag, in.Tlsverify)
 
-	case "ExportImage":
+	case "InspectContainer":
 		var in struct {
-			Name        string `json:"name"`
-			Destination string `json:"destination"`
-			Compress    bool   `json:"compress"`
+			Name string `json:"name"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress)
+		return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name)
 
-	case "InspectImage":
+	case "WaitContainer":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2196,40 +2201,45 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name)
 
-	case "RemoveImage":
+	case "DeleteStoppedContainers":
+		return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call})
+
+	case "TagImage":
 		var in struct {
-			Name  string `json:"name"`
-			Force bool   `json:"force"`
+			Name   string `json:"name"`
+			Tagged string `json:"tagged"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force)
-
-	case "GetVersion":
-		return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call})
-
-	case "ResizeContainerTty":
-		return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call})
+		return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged)
 
-	case "KillContainer":
+	case "ListContainerProcesses":
 		var in struct {
-			Name   string `json:"name"`
-			Signal int64  `json:"signal"`
+			Name string   `json:"name"`
+			Opts []string `json:"opts"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal)
+		return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts))
 
-	case "CreateImage":
-		return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call})
+	case "SearchImage":
+		var in struct {
+			Name  string `json:"name"`
+			Limit int64  `json:"limit"`
+		}
+		err := call.GetParameters(&in)
+		if err != nil {
+			return call.ReplyInvalidParameter("parameters")
+		}
+		return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit)
 
-	case "GetContainerLogs":
+	case "InspectImage":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2237,28 +2247,49 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name)
 
-	case "HistoryImage":
+	case "UpdateContainer":
+		return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call})
+
+	case "ResizeContainerTty":
+		return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call})
+
+	case "StartContainer":
+		return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call})
+
+	case "StopContainer":
 		var in struct {
-			Name string `json:"name"`
+			Name    string `json:"name"`
+			Timeout int64  `json:"timeout"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout)
 
-	case "SearchImage":
+	case "AttachToContainer":
+		return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call})
+
+	case "BuildImage":
+		return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call})
+
+	case "CreateImage":
+		return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call})
+
+	case "HistoryImage":
 		var in struct {
-			Name  string `json:"name"`
-			Limit int64  `json:"limit"`
+			Name string `json:"name"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit)
+		return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name)
+
+	case "GetInfo":
+		return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call})
 
 	case "Commit":
 		var in struct {
@@ -2275,25 +2306,6 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		}
 		return s.ioprojectatomicpodmanInterface.Commit(VarlinkCall{call}, in.Name, in.Image_name, []string(in.Changes), in.Author, in.Message, in.Pause)
 
-	case "AttachToContainer":
-		return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call})
-
-	case "WaitContainer":
-		var in struct {
-			Name string `json:"name"`
-		}
-		err := call.GetParameters(&in)
-		if err != nil {
-			return call.ReplyInvalidParameter("parameters")
-		}
-		return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name)
-
-	case "DeleteUnusedImages":
-		return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call})
-
-	case "GetInfo":
-		return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call})
-
 	case "GetContainer":
 		var in struct {
 			Name string `json:"name"`
@@ -2304,35 +2316,27 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		}
 		return s.ioprojectatomicpodmanInterface.GetContainer(VarlinkCall{call}, in.Name)
 
-	case "CreateContainer":
-		return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call})
-
-	case "ListContainerProcesses":
+	case "ExportContainer":
 		var in struct {
-			Name string   `json:"name"`
-			Opts []string `json:"opts"`
+			Name string `json:"name"`
+			Path string `json:"path"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts))
+		return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path)
 
 	case "ListImages":
 		return s.ioprojectatomicpodmanInterface.ListImages(VarlinkCall{call})
 
-	case "TagImage":
-		var in struct {
-			Name   string `json:"name"`
-			Tagged string `json:"tagged"`
-		}
-		err := call.GetParameters(&in)
-		if err != nil {
-			return call.ReplyInvalidParameter("parameters")
-		}
-		return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged)
+	case "DeleteUnusedImages":
+		return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call})
 
-	case "ListContainerChanges":
+	case "ListContainers":
+		return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call})
+
+	case "UnpauseContainer":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2340,23 +2344,19 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name)
 
-	case "ExportContainer":
+	case "PullImage":
 		var in struct {
 			Name string `json:"name"`
-			Path string `json:"path"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path)
-
-	case "UpdateContainer":
-		return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call})
+		return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name)
 
-	case "UnpauseContainer":
+	case "GetContainerStats":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -2364,7 +2364,7 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name)
+		return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name)
 
 	default:
 		return call.ReplyMethodNotFound(methodname)
@@ -2556,7 +2556,7 @@ type PodmanInfo (
 # Ping provides a response for developers to ensure their varlink setup is working.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping
 # {
 #   "ping": {
 #     "message": "OK"
@@ -2596,7 +2596,7 @@ method InspectContainer(name: string) -> (container: string)
 # error will be returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}'
 # {
 #   "container": [
 #     "  UID   PID  PPID  C STIME TTY          TIME CMD",
@@ -2630,7 +2630,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string)
 # [ContainerNotFound](#ContainerNotFound)  error will be returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}'
 # {
 #   "container": {
 #     "block_input": 0,
@@ -2663,7 +2663,7 @@ method StartContainer() -> (notimplemented: NotImplemented)
 # error will be returned instead. See also [KillContainer](KillContainer).
 # #### Error
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}'
 # {
 #   "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6"
 # }
@@ -2710,7 +2710,7 @@ method WaitContainer(name: string) -> (exitcode: int)
 # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned.
 # #### Error
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}'
 # {
 #   "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20"
 # }
@@ -2755,7 +2755,7 @@ method TagImage(name: string, tagged: string) -> (image: string)
 # ID of the removed image is returned when complete.  See also [DeleteUnusedImages](DeleteUnusedImages).
 # #### Example
 # ~~~
-# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
+# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}'
 # {
 #   "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 # }
@@ -2793,7 +2793,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image:
 # is returned.
 # #### Example
 # ~~~
-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}'
 # {
 #   "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e"
 # }
diff --git a/docs/podman-varlink.1.md b/docs/podman-varlink.1.md
index 68a0f08a2..9d4e0947b 100644
--- a/docs/podman-varlink.1.md
+++ b/docs/podman-varlink.1.md
@@ -25,7 +25,7 @@ More will go here as the docs and api firm up.
 
 ## EXAMPLES
 
-  podman varlink unix:/run/io.projectatomic.podman
+  podman varlink unix:/run/podman/io.projectatomic.podman
 <!--
     TODO: More examples with TCP can be added when that works
     as well.