diff --git a/redo/controls.go b/redo/basicctrls.go similarity index 100% rename from redo/controls.go rename to redo/basicctrls.go diff --git a/redo/controls_darwin.go b/redo/basicctrls_darwin.go similarity index 100% rename from redo/controls_darwin.go rename to redo/basicctrls_darwin.go diff --git a/redo/controls_darwin.m b/redo/basicctrls_darwin.m similarity index 100% rename from redo/controls_darwin.m rename to redo/basicctrls_darwin.m diff --git a/redo/controls_unix.go b/redo/basicctrls_unix.go similarity index 100% rename from redo/controls_unix.go rename to redo/basicctrls_unix.go diff --git a/redo/controls_windows.c b/redo/basicctrls_windows.c similarity index 100% rename from redo/controls_windows.c rename to redo/basicctrls_windows.c diff --git a/redo/controls_windows.go b/redo/basicctrls_windows.go similarity index 100% rename from redo/controls_windows.go rename to redo/basicctrls_windows.go diff --git a/redo/containers.go b/redo/containerctrls.go similarity index 100% rename from redo/containers.go rename to redo/containerctrls.go diff --git a/redo/containers_darwin.go b/redo/containerctrls_darwin.go similarity index 100% rename from redo/containers_darwin.go rename to redo/containerctrls_darwin.go diff --git a/redo/containers_darwin.m b/redo/containerctrls_darwin.m similarity index 100% rename from redo/containers_darwin.m rename to redo/containerctrls_darwin.m diff --git a/redo/containers_unix.go b/redo/containerctrls_unix.go similarity index 100% rename from redo/containers_unix.go rename to redo/containerctrls_unix.go diff --git a/redo/containers_windows.c b/redo/containerctrls_windows.c similarity index 100% rename from redo/containers_windows.c rename to redo/containerctrls_windows.c diff --git a/redo/containers_windows.go b/redo/containerctrls_windows.go similarity index 100% rename from redo/containers_windows.go rename to redo/containerctrls_windows.go