Rename wrappers
Split out commands