Change interfaces around.