Rename interaction control and layer, test and fix sanitization switch.