diff --git a/cgroups/fs/apply_raw.go b/cgroups/fs/apply_raw.go
index ba09bfb7..ba7dd768 100644
--- a/cgroups/fs/apply_raw.go
+++ b/cgroups/fs/apply_raw.go
@@ -31,7 +31,7 @@ type subsystem interface {
 	// Removes the cgroup represented by 'data'.
 	Remove(*data) error
 	// Creates and joins the cgroup represented by data.
-	Set(*data) error
+	Apply(*data) error
 }
 
 type Manager struct {
@@ -91,7 +91,7 @@ func (m *Manager) Apply(pid int) error {
 		}
 	}()
 	for name, sys := range subsystems {
-		if err := sys.Set(d); err != nil {
+		if err := sys.Apply(d); err != nil {
 			return err
 		}
 		// TODO: Apply should, ideally, be reentrant or be broken up into a separate
@@ -129,7 +129,7 @@ func ApplyDevices(c *configs.Cgroup, pid int) error {
 
 	devices := subsystems["devices"]
 
-	return devices.Set(d)
+	return devices.Apply(d)
 }
 
 func (m *Manager) GetStats() (*cgroups.Stats, error) {
@@ -159,7 +159,7 @@ func (m *Manager) Freeze(state configs.FreezerState) error {
 	m.Cgroups.Freezer = state
 
 	freezer := subsystems["freezer"]
-	err = freezer.Set(d)
+	err = freezer.Apply(d)
 	if err != nil {
 		m.Cgroups.Freezer = prevState
 		return err
diff --git a/cgroups/fs/blkio.go b/cgroups/fs/blkio.go
index b64e4684..87d91128 100644
--- a/cgroups/fs/blkio.go
+++ b/cgroups/fs/blkio.go
@@ -14,7 +14,7 @@ import (
 type BlkioGroup struct {
 }
 
-func (s *BlkioGroup) Set(d *data) error {
+func (s *BlkioGroup) Apply(d *data) error {
 	dir, err := d.join("blkio")
 	if err != nil && !cgroups.IsNotFound(err) {
 		return err
diff --git a/cgroups/fs/cpu.go b/cgroups/fs/cpu.go
index efac9ed1..385625c7 100644
--- a/cgroups/fs/cpu.go
+++ b/cgroups/fs/cpu.go
@@ -12,7 +12,7 @@ import (
 type CpuGroup struct {
 }
 
-func (s *CpuGroup) Set(d *data) error {
+func (s *CpuGroup) Apply(d *data) error {
 	// We always want to join the cpu group, to allow fair cpu scheduling
 	// on a container basis
 	dir, err := d.join("cpu")
diff --git a/cgroups/fs/cpuacct.go b/cgroups/fs/cpuacct.go
index 14b55ccd..58378125 100644
--- a/cgroups/fs/cpuacct.go
+++ b/cgroups/fs/cpuacct.go
@@ -21,7 +21,7 @@ var clockTicks = uint64(system.GetClockTicks())
 type CpuacctGroup struct {
 }
 
-func (s *CpuacctGroup) Set(d *data) error {
+func (s *CpuacctGroup) Apply(d *data) error {
 	// we just want to join this group even though we don't set anything
 	if _, err := d.join("cpuacct"); err != nil && !cgroups.IsNotFound(err) {
 		return err
diff --git a/cgroups/fs/cpuset.go b/cgroups/fs/cpuset.go
index ff67a53e..d9b3e7b7 100644
--- a/cgroups/fs/cpuset.go
+++ b/cgroups/fs/cpuset.go
@@ -13,12 +13,12 @@ import (
 type CpusetGroup struct {
 }
 
-func (s *CpusetGroup) Set(d *data) error {
+func (s *CpusetGroup) Apply(d *data) error {
 	dir, err := d.path("cpuset")
 	if err != nil {
 		return err
 	}
-	return s.SetDir(dir, d.c.CpusetCpus, d.c.CpusetMems, d.pid)
+	return s.ApplyDir(dir, d.c.CpusetCpus, d.c.CpusetMems, d.pid)
 }
 
 func (s *CpusetGroup) Remove(d *data) error {
@@ -29,7 +29,7 @@ func (s *CpusetGroup) GetStats(path string, stats *cgroups.Stats) error {
 	return nil
 }
 
-func (s *CpusetGroup) SetDir(dir, cpus string, mems string, pid int) error {
+func (s *CpusetGroup) ApplyDir(dir, cpus string, mems string, pid int) error {
 	if err := s.ensureParent(dir); err != nil {
 		return err
 	}
diff --git a/cgroups/fs/devices.go b/cgroups/fs/devices.go
index e904e10c..d1fef46f 100644
--- a/cgroups/fs/devices.go
+++ b/cgroups/fs/devices.go
@@ -5,7 +5,7 @@ import "github.com/docker/libcontainer/cgroups"
 type DevicesGroup struct {
 }
 
-func (s *DevicesGroup) Set(d *data) error {
+func (s *DevicesGroup) Apply(d *data) error {
 	dir, err := d.join("devices")
 	if err != nil {
 		return err
diff --git a/cgroups/fs/freezer.go b/cgroups/fs/freezer.go
index b881d0d4..6e9aef18 100644
--- a/cgroups/fs/freezer.go
+++ b/cgroups/fs/freezer.go
@@ -11,7 +11,7 @@ import (
 type FreezerGroup struct {
 }
 
-func (s *FreezerGroup) Set(d *data) error {
+func (s *FreezerGroup) Apply(d *data) error {
 	switch d.c.Freezer {
 	case configs.Frozen, configs.Thawed:
 		dir, err := d.path("freezer")
diff --git a/cgroups/fs/memory.go b/cgroups/fs/memory.go
index 01713fd7..573c8ab7 100644
--- a/cgroups/fs/memory.go
+++ b/cgroups/fs/memory.go
@@ -13,7 +13,7 @@ import (
 type MemoryGroup struct {
 }
 
-func (s *MemoryGroup) Set(d *data) error {
+func (s *MemoryGroup) Apply(d *data) error {
 	dir, err := d.join("memory")
 	// only return an error for memory if it was specified
 	if err != nil && (d.c.Memory != 0 || d.c.MemoryReservation != 0 || d.c.MemorySwap != 0) {
diff --git a/cgroups/fs/perf_event.go b/cgroups/fs/perf_event.go
index 813274d8..305b4c05 100644
--- a/cgroups/fs/perf_event.go
+++ b/cgroups/fs/perf_event.go
@@ -7,7 +7,7 @@ import (
 type PerfEventGroup struct {
 }
 
-func (s *PerfEventGroup) Set(d *data) error {
+func (s *PerfEventGroup) Apply(d *data) error {
 	// we just want to join this group even though we don't set anything
 	if _, err := d.join("perf_event"); err != nil && !cgroups.IsNotFound(err) {
 		return err
diff --git a/cgroups/systemd/apply_systemd.go b/cgroups/systemd/apply_systemd.go
index fbaa13c7..5d45fd6f 100644
--- a/cgroups/systemd/apply_systemd.go
+++ b/cgroups/systemd/apply_systemd.go
@@ -398,5 +398,5 @@ func joinCpuset(c *configs.Cgroup, pid int) error {
 
 	s := &fs.CpusetGroup{}
 
-	return s.SetDir(path, c.CpusetCpus, c.CpusetMems, pid)
+	return s.ApplyDir(path, c.CpusetCpus, c.CpusetMems, pid)
 }