diff --git a/classic-components-example/build.gradle b/classic-components-example/build.gradle
index 96a3d841..83acf2cc 100644
--- a/classic-components-example/build.gradle
+++ b/classic-components-example/build.gradle
@@ -15,7 +15,7 @@ allprojects {
 
         jvmToolchainVersion = 17
 
-        scanbotSdkVersion = "9.0.1"
+        scanbotSdkVersion = "10.0.0.131-STAGING-SNAPSHOT"
 
         androidCoreKtxVersion = "1.6.0"
         constraintLayoutVersion = "2.0.4"
diff --git a/classic-components-example/document-enhancer/build.gradle b/classic-components-example/document-straightener/build.gradle
similarity index 90%
rename from classic-components-example/document-enhancer/build.gradle
rename to classic-components-example/document-straightener/build.gradle
index 278714b4..c74ec304 100644
--- a/classic-components-example/document-enhancer/build.gradle
+++ b/classic-components-example/document-straightener/build.gradle
@@ -17,7 +17,7 @@ android {
 
     buildTypes {
         named("debug") {
-            
+
             minifyEnabled = false
             debuggable = true
         }
@@ -41,6 +41,6 @@ kotlin.jvmToolchain(project.ext.jvmToolchainVersion)
 dependencies {
     implementation(project(":common"))
     implementation("io.scanbot:sdk-package-1:${project.ext.scanbotSdkVersion}")
-    implementation("io.scanbot:sdk-document-enhancer-assets:${project.ext.scanbotSdkVersion}")
+    implementation("io.scanbot:sdk-document-straightener-assets:${project.ext.scanbotSdkVersion}")
     implementation("androidx.appcompat:appcompat:${project.ext.androidxAppcompatVersion}")
 }
diff --git a/classic-components-example/document-enhancer/src/main/AndroidManifest.xml b/classic-components-example/document-straightener/src/main/AndroidManifest.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/AndroidManifest.xml
rename to classic-components-example/document-straightener/src/main/AndroidManifest.xml
diff --git a/classic-components-example/document-enhancer/src/main/java/io/scanbot/example/DocumentCameraActivity.kt b/classic-components-example/document-straightener/src/main/java/io/scanbot/example/DocumentCameraActivity.kt
similarity index 91%
rename from classic-components-example/document-enhancer/src/main/java/io/scanbot/example/DocumentCameraActivity.kt
rename to classic-components-example/document-straightener/src/main/java/io/scanbot/example/DocumentCameraActivity.kt
index bd247620..6e6c9dd9 100755
--- a/classic-components-example/document-enhancer/src/main/java/io/scanbot/example/DocumentCameraActivity.kt
+++ b/classic-components-example/document-straightener/src/main/java/io/scanbot/example/DocumentCameraActivity.kt
@@ -18,7 +18,7 @@ import io.scanbot.sdk.ScanbotSDK
 import io.scanbot.sdk.camera.CaptureInfo
 import io.scanbot.sdk.document.ui.DocumentScannerView
 import io.scanbot.sdk.document.ui.IDocumentScannerViewCallback
-import io.scanbot.sdk.documentscanner.DocumentEnhancer
+import io.scanbot.sdk.documentscanner.DocumentStraightener
 import io.scanbot.sdk.documentscanner.DocumentStraighteningMode
 import io.scanbot.sdk.documentscanner.DocumentStraighteningParameters
 import io.scanbot.sdk.image.ImageRef
@@ -50,7 +50,7 @@ class DocumentCameraActivity : AppCompatActivity() {
 
         documentScannerView = findViewById(R.id.document_scanner_view)
         resultView = findViewById<View>(R.id.result) as ImageView
-        val documentEnhancer = scanbotSdk.createDocumentEnhancer()
+        val documentStraightener = scanbotSdk.createDocumentStraightener()
         scanbotSdk.createDocumentScanner().onSuccess { documentScanner ->
 
             documentScannerView.apply {
@@ -70,8 +70,8 @@ class DocumentCameraActivity : AppCompatActivity() {
                         }
 
                         override fun onPictureTaken(image: ImageRef, captureInfo: CaptureInfo) {
-                            documentEnhancer.onSuccess { documentEnhancer ->
-                                processPictureTaken(image, documentEnhancer)
+                            documentStraightener.onSuccess { straightener ->
+                                processPictureTaken(image, straightener)
                             }
 
 
@@ -134,10 +134,10 @@ class DocumentCameraActivity : AppCompatActivity() {
         super.onPause()
     }
 
-    private fun processPictureTaken(image: ImageRef, documentEnhancer: DocumentEnhancer) {
+    private fun processPictureTaken(image: ImageRef, documentStraightener: DocumentStraightener) {
         // STRAIGHTEN SCANNED IMAGE ASSUMING DOCUMENT IS BENT
-        // Run document enhancer unwarping on original image:
-        val result = documentEnhancer.straighten(image, DocumentStraighteningParameters().apply {
+        // Run document straightening on original image:
+        val result = documentStraightener.run(image, DocumentStraighteningParameters().apply {
             straighteningMode = DocumentStraighteningMode.STRAIGHTEN
             // uncomment if you want wo set specific aspect ratios for documents
             // aspectRatios = listOf(AspectRatio(29.0, 21.0))
diff --git a/classic-components-example/document-enhancer/src/main/java/io/scanbot/example/ExampleApplication.kt b/classic-components-example/document-straightener/src/main/java/io/scanbot/example/ExampleApplication.kt
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/java/io/scanbot/example/ExampleApplication.kt
rename to classic-components-example/document-straightener/src/main/java/io/scanbot/example/ExampleApplication.kt
diff --git a/classic-components-example/document-enhancer/src/main/java/io/scanbot/example/MainActivity.kt b/classic-components-example/document-straightener/src/main/java/io/scanbot/example/MainActivity.kt
similarity index 96%
rename from classic-components-example/document-enhancer/src/main/java/io/scanbot/example/MainActivity.kt
rename to classic-components-example/document-straightener/src/main/java/io/scanbot/example/MainActivity.kt
index 7f75a3d2..c9e1ce33 100644
--- a/classic-components-example/document-enhancer/src/main/java/io/scanbot/example/MainActivity.kt
+++ b/classic-components-example/document-straightener/src/main/java/io/scanbot/example/MainActivity.kt
@@ -94,8 +94,8 @@ class MainActivity : AppCompatActivity() {
             } ?: throw IllegalStateException("Cannot open input stream from URI: $uri")
 
             // run document scanning on the image:
-            scanbotSdk.createDocumentEnhancer().getOrNull()
-                ?.straighten(image, parameters = DocumentStraighteningParameters().apply {
+            scanbotSdk.createDocumentStraightener().getOrNull()
+                ?.run(image, parameters = DocumentStraighteningParameters().apply {
                     straighteningMode = DocumentStraighteningMode.STRAIGHTEN
                     // uncomment if you want wo set specific aspect ratios for documents
                     // aspectRatios = listOf(AspectRatio(29.0, 21.0))
diff --git a/classic-components-example/document-enhancer/src/main/res/layout/activity_camera.xml b/classic-components-example/document-straightener/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/layout/activity_camera.xml
rename to classic-components-example/document-straightener/src/main/res/layout/activity_camera.xml
diff --git a/classic-components-example/document-enhancer/src/main/res/layout/activity_main.xml b/classic-components-example/document-straightener/src/main/res/layout/activity_main.xml
similarity index 93%
rename from classic-components-example/document-enhancer/src/main/res/layout/activity_main.xml
rename to classic-components-example/document-straightener/src/main/res/layout/activity_main.xml
index 638005e1..4f6878bc 100755
--- a/classic-components-example/document-enhancer/src/main/res/layout/activity_main.xml
+++ b/classic-components-example/document-straightener/src/main/res/layout/activity_main.xml
@@ -21,13 +21,13 @@
             android:id="@+id/show_doc_scanner_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Scan document and enhance" />
+            android:text="Scan document and straighten" />
 
         <Button
             android:id="@+id/import_image"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Import image and enhance" />
+            android:text="Import image and straighten" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <ProgressBar
diff --git a/classic-components-example/document-enhancer/src/main/res/menu/menu_main.xml b/classic-components-example/document-straightener/src/main/res/menu/menu_main.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/menu/menu_main.xml
rename to classic-components-example/document-straightener/src/main/res/menu/menu_main.xml
diff --git a/classic-components-example/document-enhancer/src/main/res/mipmap-hdpi/icon.png b/classic-components-example/document-straightener/src/main/res/mipmap-hdpi/icon.png
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/mipmap-hdpi/icon.png
rename to classic-components-example/document-straightener/src/main/res/mipmap-hdpi/icon.png
diff --git a/classic-components-example/document-enhancer/src/main/res/mipmap-mdpi/icon.png b/classic-components-example/document-straightener/src/main/res/mipmap-mdpi/icon.png
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/mipmap-mdpi/icon.png
rename to classic-components-example/document-straightener/src/main/res/mipmap-mdpi/icon.png
diff --git a/classic-components-example/document-enhancer/src/main/res/mipmap-xhdpi/icon.png b/classic-components-example/document-straightener/src/main/res/mipmap-xhdpi/icon.png
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/mipmap-xhdpi/icon.png
rename to classic-components-example/document-straightener/src/main/res/mipmap-xhdpi/icon.png
diff --git a/classic-components-example/document-enhancer/src/main/res/mipmap-xxhdpi/icon.png b/classic-components-example/document-straightener/src/main/res/mipmap-xxhdpi/icon.png
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/mipmap-xxhdpi/icon.png
rename to classic-components-example/document-straightener/src/main/res/mipmap-xxhdpi/icon.png
diff --git a/classic-components-example/document-enhancer/src/main/res/values-w820dp/dimens.xml b/classic-components-example/document-straightener/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/values-w820dp/dimens.xml
rename to classic-components-example/document-straightener/src/main/res/values-w820dp/dimens.xml
diff --git a/classic-components-example/document-enhancer/src/main/res/values/dimens.xml b/classic-components-example/document-straightener/src/main/res/values/dimens.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/values/dimens.xml
rename to classic-components-example/document-straightener/src/main/res/values/dimens.xml
diff --git a/classic-components-example/document-enhancer/src/main/res/values/strings.xml b/classic-components-example/document-straightener/src/main/res/values/strings.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/values/strings.xml
rename to classic-components-example/document-straightener/src/main/res/values/strings.xml
diff --git a/classic-components-example/document-enhancer/src/main/res/values/styles.xml b/classic-components-example/document-straightener/src/main/res/values/styles.xml
similarity index 100%
rename from classic-components-example/document-enhancer/src/main/res/values/styles.xml
rename to classic-components-example/document-straightener/src/main/res/values/styles.xml
diff --git a/classic-components-example/settings.gradle.kts b/classic-components-example/settings.gradle.kts
index 4cc318dd..8d22a0ac 100755
--- a/classic-components-example/settings.gradle.kts
+++ b/classic-components-example/settings.gradle.kts
@@ -26,7 +26,7 @@ include(
     ":edit-polygon-view",
     ":camera-fragment",
     ":document-scanner",
-    ":document-enhancer",
+    ":document-straightener",
     ":barcode-scanner",
     ":mrz-scanner",
     ":mc-scanner",
diff --git a/compose-custom-ui-example/app/build.gradle b/compose-custom-ui-example/app/build.gradle
index fc4e4c70..5128be5a 100644
--- a/compose-custom-ui-example/app/build.gradle
+++ b/compose-custom-ui-example/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version")
 
-    def scanbotSdkVersion = "9.0.1"
+    def scanbotSdkVersion = "10.0.0.131-STAGING-SNAPSHOT"
 
     implementation("io.scanbot:sdk-package-4:$scanbotSdkVersion")
     implementation("io.scanbot:rtu-ui-v2-bundle:$scanbotSdkVersion")
diff --git a/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/DocumentCleanupScreen.kt b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/DocumentCleanupScreen.kt
new file mode 100644
index 00000000..a720f3bb
--- /dev/null
+++ b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/DocumentCleanupScreen.kt
@@ -0,0 +1,174 @@
+@file:kotlin.OptIn(ExperimentalPermissionsApi::class)
+
+package io.scanbot.example.compose
+
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.util.Log
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.material3.Button
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import io.scanbot.sdk.image.ImageRef
+import io.scanbot.sdk.imageprocessing.DocumentCleanupConfiguration
+import io.scanbot.sdk.ui_v2.document.DocumentCleanupCustomUI
+import io.scanbot.sdk.ui_v2.document.screen.documentcleanup.DocumentCleanupActionController
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * Interactive demo screen for [DocumentCleanupCustomUI]. The user picks an image from the
+ * gallery, paints a mask on top of it and the masked regions are cleaned up by the SDK.
+ *
+ * For a code-only snippet (no image picker, no navigation), see
+ * [io.scanbot.example.compose.doc_code_snippet.document.DocumentCleanupCustomUISnippet].
+ */
+@Composable
+fun DocumentCleanupScreen(navController: NavHostController) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    var inputImage by remember { mutableStateOf<ImageRef?>(null) }
+    val controller = remember { mutableStateOf<DocumentCleanupActionController?>(null) }
+    val brushSize = remember { mutableFloatStateOf(40f) }
+
+    val activeController = controller.value
+    val canUndo = activeController?.canUndo?.collectAsState()?.value ?: false
+    val canRedo = activeController?.canRedo?.collectAsState()?.value ?: false
+    val progress = activeController?.progress?.collectAsState()?.value ?: false
+
+    val pickImageLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.PickVisualMedia()
+    ) { uri: Uri? ->
+        if (uri == null) return@rememberLauncherForActivityResult
+        scope.launch {
+            val newImage = withContext(Dispatchers.IO) {
+                runCatching {
+                    context.contentResolver.openInputStream(uri)?.use { stream ->
+                        BitmapFactory.decodeStream(stream)
+                    }
+                }.getOrNull()?.let { ImageRef.fromBitmap(it) }
+            }
+            if (newImage != null) {
+                inputImage?.close()
+                inputImage = newImage
+            } else {
+                Log.e("DocumentCleanupScreen", "Failed to load image from $uri")
+            }
+        }
+    }
+
+    Column(modifier = Modifier.fillMaxSize().systemBarsPadding()) {
+        Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
+            val image = inputImage
+            if (image != null) {
+                DocumentCleanupCustomUI(
+                    image = image,
+                    modifier = Modifier.fillMaxSize(),
+                    documentCleanupConfiguration = DocumentCleanupConfiguration(
+                        keepText = true,
+                        maxUndoRedoStackSize = 10,
+                    ),
+                    brushSize = brushSize.floatValue.dp,
+                    brushColor = Color.Red.copy(alpha = 0.5f),
+                    onActionControllerCreated = { controller.value = it },
+                    onResultImageChanged = {
+                        Log.d("DocumentCleanupScreen", "New result image received")
+                    },
+                    onError = { error ->
+                        Log.e("DocumentCleanupScreen", "Cleanup error", error)
+                    },
+                )
+                if (progress) {
+                    LinearProgressIndicator(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .align(Alignment.TopCenter),
+                    )
+                }
+            } else {
+                Box(modifier = Modifier.fillMaxSize()) {
+                    Text(
+                        text = "Pick an image to start cleanup",
+                        modifier = Modifier.padding(16.dp),
+                    )
+                }
+            }
+        }
+
+        Column(modifier = Modifier.fillMaxWidth().padding(8.dp)) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                Button(
+                    modifier = Modifier.weight(1f),
+                    onClick = {
+                        pickImageLauncher.launch(
+                            PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
+                        )
+                    },
+                ) { Text("Pick image") }
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Row(modifier = Modifier.fillMaxWidth()) {
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canUndo && !progress,
+                    onClick = { activeController?.undo() },
+                ) { Text(text = "Undo", color = Color.White) }
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canRedo && !progress,
+                    onClick = { activeController?.redo() },
+                ) { Text(text = "Redo", color = Color.White) }
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canUndo && !progress,
+                    onClick = { activeController?.reset() },
+                ) { Text(text = "Reset", color = Color.White) }
+            }
+
+            Text(
+                modifier = Modifier.padding(top = 8.dp),
+                text = "Brush size: ${brushSize.floatValue.toInt()} dp",
+            )
+            Slider(
+                value = brushSize.floatValue,
+                onValueChange = { brushSize.floatValue = it },
+                valueRange = 8f..120f,
+            )
+        }
+    }
+}
diff --git a/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/MainActivity.kt b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/MainActivity.kt
index 652d676e..1412e7bd 100644
--- a/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/MainActivity.kt
+++ b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/MainActivity.kt
@@ -72,6 +72,7 @@ sealed class Screen(val route: String) {
     object BarcodeFindAndPick : Screen("BarcodeFindAndPick")
 
     object DocumentScanner1 : Screen("DocumentScanner1")
+    object DocumentCleanup1 : Screen("DocumentCleanup1")
     object MrzScanner1 : Screen("MrzScanner1")
     data class BarcodeDetail(val data: String, val format: String) :
         Screen("barcodeDetail/{data}/{format}") {
@@ -90,6 +91,7 @@ fun AppNavHost(navController: NavHostController) {
     NavHost(navController = navController, startDestination = Screen.Menu.route) {
         composable(Screen.Menu.route) { MenuScreen(navController) }
         composable(Screen.DocumentScanner1.route) { DocumentScannerScreen(navController) }
+        composable(Screen.DocumentCleanup1.route) { DocumentCleanupScreen(navController) }
         composable(Screen.MrzScanner1.route) { MrzScannerScreen(navController) }
         composable(
             route = "barcodeDetail/{data}/{format}",
@@ -122,6 +124,11 @@ fun MenuScreen(navController: NavHostController) {
             Screen.DocumentScanner1.route,
             ""
         ),
+        Triple(
+            "Document Cleanup",
+            Screen.DocumentCleanup1.route,
+            ""
+        ),
         Triple(
             "MRZ Scanner",
             Screen.MrzScanner1.route,
diff --git a/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/doc_code_snippet/document/DocumentCleanupSnippet.kt b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/doc_code_snippet/document/DocumentCleanupSnippet.kt
new file mode 100644
index 00000000..0c53c726
--- /dev/null
+++ b/compose-custom-ui-example/app/src/main/java/io/scanbot/example/compose/doc_code_snippet/document/DocumentCleanupSnippet.kt
@@ -0,0 +1,127 @@
+package io.scanbot.example.compose.doc_code_snippet.document
+
+import android.util.Log
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import io.scanbot.sdk.image.ImageRef
+import io.scanbot.sdk.imageprocessing.DocumentCleanupConfiguration
+import io.scanbot.sdk.ui_v2.document.DocumentCleanupCustomUI
+import io.scanbot.sdk.ui_v2.document.screen.documentcleanup.DocumentCleanupActionController
+
+// @Tag("Document Cleanup Custom UI Composable")
+/**
+ * Renders the `DocumentCleanupCustomUI` composable on top of the supplied [image].
+ *
+ * The composable wraps the `DocumentCleanup` classic API and gives the host application
+ * full control over the surrounding chrome (top bar, bottom bar, undo / redo / reset
+ * controls, brush-size slider, etc.).
+ *
+ * Use the [DocumentCleanupActionController] exposed via `onActionControllerCreated` to
+ * trigger undo / redo / reset programmatically and to observe the current operation
+ * progress and undo / redo availability.
+ */
+@Composable
+fun DocumentCleanupCustomUISnippet(image: ImageRef) {
+    val controller = remember { mutableStateOf<DocumentCleanupActionController?>(null) }
+    val brushSize = remember { mutableFloatStateOf(40f) }
+    val activeController = controller.value
+    val canUndo = activeController?.canUndo?.collectAsState()?.value ?: false
+    val canRedo = activeController?.canRedo?.collectAsState()?.value ?: false
+    val progress = activeController?.progress?.collectAsState()?.value ?: false
+
+    Column(modifier = Modifier.fillMaxSize()) {
+        Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
+            DocumentCleanupCustomUI(
+                image = image,
+                modifier = Modifier.fillMaxSize(),
+                // SDK-level cleanup configuration: keepText, undo/redo stack size, etc.
+                documentCleanupConfiguration = DocumentCleanupConfiguration(
+                    keepText = true,
+                    maxUndoRedoStackSize = 10,
+                ),
+                // Background color behind the image canvas
+                backgroundColor = Color.Black,
+                // Diameter of the drawing brush
+                brushSize = brushSize.floatValue.dp,
+                // Brush stroke preview color
+                brushColor = Color.Red.copy(alpha = 0.5f),
+                // Maximum zoom scale supported by pinch-to-zoom
+                maxZoomScale = 10f,
+                // Capture the action controller to trigger undo / redo / reset and observe state.
+                onActionControllerCreated = { controller.value = it },
+                // Triggered after every successful cleanup, undo, redo or reset.
+                // The provided ImageRef is owned by the composable - DO NOT close it.
+                onResultImageChanged = { newImage ->
+                    Log.d("DocumentCleanupCustomUI", "New result image: $newImage")
+                },
+                // Invoked on SDK setup or cleanup failures.
+                onError = { error ->
+                    Log.e("DocumentCleanupCustomUI", "Cleanup error: ${error.message}")
+                },
+            )
+
+            if (progress) {
+                LinearProgressIndicator(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .align(Alignment.TopCenter),
+                )
+            }
+        }
+
+        Column(modifier = Modifier.fillMaxWidth().padding(8.dp)) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canUndo && !progress,
+                    onClick = { activeController?.undo() },
+                ) { Text("Undo") }
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canRedo && !progress,
+                    onClick = { activeController?.redo() },
+                ) { Text("Redo") }
+                Button(
+                    modifier = Modifier.weight(1f),
+                    enabled = canUndo && !progress,
+                    onClick = { activeController?.reset() },
+                ) { Text("Reset") }
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(text = "Brush size: ${brushSize.floatValue.toInt()} dp")
+            Slider(
+                value = brushSize.floatValue,
+                onValueChange = { brushSize.floatValue = it },
+                valueRange = 8f..120f,
+            )
+        }
+    }
+}
+// @EndTag("Document Cleanup Custom UI Composable")
diff --git a/data-capture-ready-to-use-ui-example/app/build.gradle b/data-capture-ready-to-use-ui-example/app/build.gradle
index 3d44e1e0..09983fd8 100644
--- a/data-capture-ready-to-use-ui-example/app/build.gradle
+++ b/data-capture-ready-to-use-ui-example/app/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version")
 
-    def scanbotSdkVersion = "9.0.1"
+    def scanbotSdkVersion = "10.0.0.131-STAGING-SNAPSHOT"
 
     implementation("io.scanbot:sdk-package-4:$scanbotSdkVersion")
     implementation("io.scanbot:rtu-ui-v2-bundle:$scanbotSdkVersion")
diff --git a/data-capture-ready-to-use-ui-example/app/src/main/java/io/scanbot/example/doc_code_snippet/migration/RtuUi2DocumentSnippets.kt b/data-capture-ready-to-use-ui-example/app/src/main/java/io/scanbot/example/doc_code_snippet/migration/RtuUi2DocumentSnippets.kt
index d38136aa..d991d5e4 100644
--- a/data-capture-ready-to-use-ui-example/app/src/main/java/io/scanbot/example/doc_code_snippet/migration/RtuUi2DocumentSnippets.kt
+++ b/data-capture-ready-to-use-ui-example/app/src/main/java/io/scanbot/example/doc_code_snippet/migration/RtuUi2DocumentSnippets.kt
@@ -107,11 +107,11 @@ private fun openDocumentScannerRtuV2() {
             )
 
             // You may hide the import button in the camera screen, if you don't need it:
-            bottomBar.importButton.visible = false
+            toolbar.importButton.visible = false
         }
 
-        // Equivalent to setBottomBarBackgroundColor(Color.RED), but not recommended:
-        appearance.bottomBarBackgroundColor = ScanbotColor(Color.BLUE)
+        // Equivalent to setToolBarBackgroundColor(Color.RED), but not recommended:
+        appearance.toolbarBackgroundColor = ScanbotColor(Color.BLUE)
 
         // However, now all the colors can be conveniently set using the Palette object:
         palette.apply {
@@ -143,7 +143,7 @@ private fun openDocumentScannerRtuV2() {
 // @Tag("Open Cropping UI RTU v2")
 // Your activity class:
 class MainActivityWithCroppingRtuV2 : AppCompatActivity() {
-    private lateinit var croppingResultLauncher: ActivityResultLauncher<CroppingConfiguration>
+    private lateinit var croppingResultLauncher: ActivityResultLauncher<CroppingStandaloneConfiguration>
 
     @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -194,10 +194,10 @@ class MainActivityWithCroppingRtuV2 : AppCompatActivity() {
 private fun openCroppingRtuV2(
     documentUuid: String,
     pageUuid: String,
-    croppingResultLauncher: ActivityResultLauncher<CroppingConfiguration>
+    croppingResultLauncher: ActivityResultLauncher<CroppingStandaloneConfiguration>
 ) {
     // Customize text resources, behavior and UI:
-    val configuration = CroppingConfiguration(
+    val configuration = CroppingStandaloneConfiguration(
         // Now you need to pass the document UUID and the page UUID:
         documentUuid = documentUuid,
         pageUuid = pageUuid,
@@ -274,7 +274,7 @@ private fun openDocumentScannerRtuV2withFinder(documentScannerResultLauncher: Ac
                 visible = true
                 aspectRatio = AspectRatio(3.0, 4.0)
             }
-            bottomBar.apply {
+            toolbar.apply {
                 previewButton = PreviewButton.noButtonMode()
                 autoSnappingModeButton.visible = false
                 importButton.visible = false
@@ -300,4 +300,4 @@ fun storageMigrationSnippet(context: Context) {
 
     // Now you may delete the files corresponding to the `legacyPages` to free up storage.
 }
-// @EndTag("Storage Migration")
\ No newline at end of file
+// @EndTag("Storage Migration")
diff --git a/data-capture-ready-to-use-ui-example/app/src/main/res/values/strings.xml b/data-capture-ready-to-use-ui-example/app/src/main/res/values/strings.xml
index cec5a1c1..9168f176 100644
--- a/data-capture-ready-to-use-ui-example/app/src/main/res/values/strings.xml
+++ b/data-capture-ready-to-use-ui-example/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
     <string name="scan_mrz">Scan MRZ</string>
     <string name="scan_ehic">Scan European Health Insurance Card</string>
     <string name="scan_mc">Medical Certificate recognizer</string>
-    <string name="copyright_note">© 2024 by Scanbot SDK GmbH. All rights reserved.</string>
+    <string name="copyright_note">© 2026 by Scanbot SDK GmbH. All rights reserved.</string>
     <string name="the_demo_expired">The demo app will terminate because of the missing license key. Get your free 30-day license today!</string>
     <string name="demo_expired">Demo Expired</string>
     <string name="cancel_dialog_button">Cancel</string>
diff --git a/document-scanner-ready-to-use-ui-example/app/build.gradle b/document-scanner-ready-to-use-ui-example/app/build.gradle
index b861c16e..a88dfe5f 100644
--- a/document-scanner-ready-to-use-ui-example/app/build.gradle
+++ b/document-scanner-ready-to-use-ui-example/app/build.gradle
@@ -37,7 +37,7 @@ android {
     }
 }
 
-def scanbotSdkVersion =  "9.0.1"
+def scanbotSdkVersion =  "10.0.0.131-STAGING-SNAPSHOT"
 
 dependencies {
 
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageStraighteningSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageStraighteningSnippet.kt
index 614af4d4..8999b028 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageStraighteningSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageStraighteningSnippet.kt
@@ -1,7 +1,6 @@
 package com.example.scanbot.doc_code_snippet
 
 
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -12,16 +11,12 @@ import com.example.scanbot.utils.getUrisFromGalleryResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import io.scanbot.common.onFailure
 import io.scanbot.common.onSuccess
-import io.scanbot.page.PageImageSource
 import io.scanbot.sdk.ScanbotSDK
-import io.scanbot.sdk.docprocessing.Document
 import io.scanbot.sdk.documentscanner.DocumentStraighteningMode
 import io.scanbot.sdk.documentscanner.DocumentStraighteningParameters
 import io.scanbot.sdk.geometry.AspectRatio
 import io.scanbot.sdk.image.ImageRef
-import io.scanbot.sdk.util.isDefault
 import io.scanbot.sdk.util.toImageRef
 
 
@@ -34,7 +29,6 @@ class ImageStraighteningSnippet : AppCompatActivity() {
     }
 
     private val scanbotSDK = ScanbotSDK(this@ImageStraighteningSnippet)
-    private val context = this
 
     private val pictureForDocDetectionResult =
         this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult ->
@@ -63,13 +57,13 @@ class ImageStraighteningSnippet : AppCompatActivity() {
 
     // @Tag("Direct Document straightening on image")
     fun startStraightening(imageRef: ImageRef) {
-       scanbotSDK.createDocumentEnhancer().onSuccess { enhancer ->
+       scanbotSDK.createDocumentStraightener().onSuccess { enhancer ->
            val params =   DocumentStraighteningParameters(
                straighteningMode = DocumentStraighteningMode.STRAIGHTEN,
                // Expected aspect ratios for the documents. Comment if unknown.
                aspectRatios = listOf(AspectRatio(3.0, 4.0))
            )
-           enhancer.straighten(imageRef, params).onSuccess { result ->
+           enhancer.run(imageRef, params).onSuccess { result ->
                //  result.straightenedImage is an ImageRef of the straightened image, you can display it in the UI or save it to storage
            }
        }
@@ -88,6 +82,4 @@ class ImageStraighteningSnippet : AppCompatActivity() {
         )
         pictureForDocDetectionResult.launch(Intent.createChooser(imageIntent, "Select Picture"))
     }
-
 }
-
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/AcknowledgeScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/AcknowledgeScreenSnippet.kt
index 5aee043c..1fc103f0 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/AcknowledgeScreenSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/AcknowledgeScreenSnippet.kt
@@ -62,16 +62,16 @@ class AcknowledgeScreenSnippet : AppCompatActivity() {
                 // Set the background color for the acknowledgment screen.
                 backgroundColor = ScanbotColor(value = "#EFEFEF")
 
-                // You can also configure the buttons in the bottom bar of the acknowledgment screen.
+                // You can also configure the buttons in the tool bar of the acknowledgment screen.
                 // e.g To force the user to retake, if the captured document is not OK.
-                bottomBar.proceedAnywayButton.visible = false
+                toolbar.proceedAnywayButton.visible = false
 
                 // Hide the titles of the buttons.
-                bottomBar.proceedAnywayButton.documentNotFound.title.visible = false
-                bottomBar.proceedAnywayButton.uncertainQuality.title.visible = false
-                bottomBar.proceedAnywayButton.unacceptableQuality.title.visible = false
-                bottomBar.acceptWhenAcceptableButton.title.visible = false
-                bottomBar.retakeButton.title.visible = false
+                toolbar.proceedAnywayButton.documentNotFound.title.visible = false
+                toolbar.proceedAnywayButton.uncertainQuality.title.visible = false
+                toolbar.proceedAnywayButton.unacceptableQuality.title.visible = false
+                toolbar.acceptWhenAcceptableButton.title.visible = false
+                toolbar.retakeButton.title.visible = false
 
                 // Configure the acknowledgment screen's hint message which is shown if the least acceptable quality is not met.
                 documentNotFoundWarning.visible = true
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/CroppingScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/CroppingScreenSnippet.kt
index 370d1286..eb97e017 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/CroppingScreenSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/CroppingScreenSnippet.kt
@@ -56,9 +56,9 @@ class CroppingScreenSnippet : AppCompatActivity() {
             // Controls whether to resume an existing draft session or start a new one when DOCUMENT_UUID is null.
             cleanScanningSession = true
 
-            // MARK: Configure the bottom bar and the bottom bar buttons.
-            // Set the background color of the bottom bar.
-            appearance.bottomBarBackgroundColor = ScanbotColor(value = "#C8193C")
+            // MARK: Configure the tool bar and the tool bar buttons.
+            // Set the background color of the tool bar.
+            appearance.toolbarBackgroundColor = ScanbotColor(value = "#C8193C")
             // e.g. configure .
             appearance.topBarBackgroundColor = ScanbotColor(color = Color.RED)
             // Retrieve the camera screen configuration.
@@ -67,7 +67,7 @@ class CroppingScreenSnippet : AppCompatActivity() {
             localization.croppingTopBarCancelButtonTitle = "Cancel"
             screens.cropping.apply {
                 // e.g disable the rotation feature.
-                bottomBar.rotateButton.visible = false
+                toolbar.rotateButton.visible = false
 
                 topBarConfirmButton.foreground.color =
                     ScanbotColor(color = Color.WHITE)
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/DocumentCleanupScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/DocumentCleanupScreenSnippet.kt
new file mode 100644
index 00000000..e711d513
--- /dev/null
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/DocumentCleanupScreenSnippet.kt
@@ -0,0 +1,133 @@
+package com.example.scanbot.doc_code_snippet.rtu_ui
+
+
+import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.ui.graphics.Color
+import io.scanbot.common.onCancellation
+import io.scanbot.common.onFailure
+import io.scanbot.common.onSuccess
+import io.scanbot.sdk.imageprocessing.DocumentCleanupConfiguration
+// @Tag("Document Cleanup Screen")
+import io.scanbot.sdk.ui_v2.common.ScanbotColor
+import io.scanbot.sdk.ui_v2.document.DocumentScannerActivity
+import io.scanbot.sdk.ui_v2.document.configuration.DocumentScanningFlow
+
+
+/**
+ * Configures and launches the Scanbot Document Scanner RTU UI v2 with a customized
+ * Document Cleanup screen. The cleanup screen is opened from the Review screen via the
+ * `documentCleanupButton` and lets the user manually erase parts of a scanned page.
+ */
+class DocumentCleanupScreenSnippet : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // In the real application, you should call this function on a button click.
+        startScanning()
+    }
+
+    private val documentScannerResult: ActivityResultLauncher<DocumentScanningFlow> by lazy {
+        registerForActivityResult(DocumentScannerActivity.ResultContract()) { result ->
+            result.onSuccess { document ->
+                // Handle the scanned document. Cleanup edits are persisted on the page.
+            }.onCancellation {
+                // The user closed the scanner without confirming.
+            }.onFailure {
+                when (it) {
+                    is io.scanbot.common.Result.InvalidLicenseError -> {
+                        // Indicates that the Scanbot SDK license is invalid.
+                    }
+
+                    else -> {
+                        // Handle other errors.
+                    }
+                }
+            }
+        }
+    }
+
+    fun startScanning() {
+        // Create the default configuration object.
+        val configuration = DocumentScanningFlow().apply {
+
+            // The Document Cleanup screen is reachable from the Review screen via the
+            // `documentCleanupButton`. Make sure the review screen is enabled and the button
+            // is visible.
+            // NOTE: toolbar only shows 5 items minimum, and dynamically hides the rest in a popup menu.
+            // On a standard smartphone device, the cleanup button is usually reachable only from the 'More' menu.
+            screens.review.apply {
+                enabled = true
+
+                toolbar.documentCleanupButton.barButton.visible = true
+
+                // Optionally style the button.
+                toolbar.documentCleanupButton.barButton.title.color =
+                    ScanbotColor(color = Color.White)
+                // OR - optionally style the relevant popup-menu item.
+                toolbar.documentCleanupButton.popupMenuItem.title.color =
+                    ScanbotColor(color = Color.Black)
+            }
+
+            // Retrieve the cleanup screen configuration from the main configuration object.
+            screens.cleanup.apply {
+                this.engineConfiguration = DocumentCleanupConfiguration(
+                    keepText = false,  // If true, the cleanup tool will not allow erasing text. But it takes some time to process OCR on the image initially,
+                    maxUndoRedoStackSize = 4, // The maximum number of undo/redo operations that can be performed. Make it less to save up memory
+                    maxCleanupResolution = 1_200_000,  // Downscales stroke area to this value in pixels (width x height) to speed up the cleanup process. The smaller the value the faster but quality will be lower too.
+                )
+                // Customize the top bar.
+                topBarTitle.text = "Clean up the page"
+                topBarBackButton.text = "Cancel"
+                topBarConfirmButton.text = "Done"
+
+                // Background color of the canvas behind the image.
+                backgroundColor = ScanbotColor(value = "#222222")
+
+                // Configure the tool bar buttons (undo / redo / reset).
+                toolbar.undoButton.title.text = "Undo"
+                toolbar.redoButton.title.text = "Redo"
+                toolbar.resetButton.title.text = "Reset"
+
+                // Configure the stroke-size slider.
+                toolbar.strokeSizeSlider.apply {
+                    visible = true
+                    minStrokeSize = 1
+                    maxStrokeSize = 50
+                    title.text = "Brush size"
+                }
+
+                // Customize the stroke-size indicator (the round preview of the current brush).
+                strokeSizeIndicator.apply {
+                    backgroundColor = ScanbotColor(value = "#00C853")
+                    borderColor = ScanbotColor(value = "#FFFFFF")
+                    opacity = 0.9
+                }
+
+                // Optional: show an introduction screen the first time the user opens cleanup.
+                introduction.showAutomatically = true
+
+                // Customize the alert dialogs shown for Reset and for cancelling with unsaved
+                // changes.
+                resetAllEditsAlertDialog.title.text = "Reset all edits?"
+                resetAllEditsAlertDialog.subtitle.text =
+                    "This will revert all cleanup operations on this page."
+
+                discardChangesAlertDialog.title.text = "Discard changes?"
+                discardChangesAlertDialog.subtitle.text =
+                    "Your cleanup edits on this page will be lost."
+            }
+
+            // Optionally customize text shown by the cleanup screen via the shared localization
+            // object (useful when not using string resources).
+            localization.documentCleanupScreenTitle = "Clean up the page"
+            localization.documentCleanupUndoButtonTitle = "Undo"
+            localization.documentCleanupRedoButtonTitle = "Redo"
+            localization.documentCleanupResetButtonTitle = "Reset"
+        }
+
+        // Start the scanner activity.
+        documentScannerResult.launch(configuration)
+    }
+}
+// @EndTag("Document Cleanup Screen")
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ReviewScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ReviewScreenSnippet.kt
index df902088..426b672d 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ReviewScreenSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ReviewScreenSnippet.kt
@@ -1,12 +1,10 @@
 package com.example.scanbot.doc_code_snippet.rtu_ui
 
 
-import android.app.Activity
 import android.os.Bundle
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.graphics.Color
-import io.scanbot.common.Result
 import io.scanbot.common.onCancellation
 import io.scanbot.common.onFailure
 import io.scanbot.common.onSuccess
@@ -57,7 +55,7 @@ class ReviewScreenSnippet : AppCompatActivity() {
                 zoomButton.visible = false
 
                 // Hide the add button.
-                bottomBar.addButton.visible = false
+                toolbar.addButton.barButton.visible = false
             }
             // Retrieve the instance of the reorder pages configuration from the main configuration object.
             screens.reorderPages.apply {
@@ -72,16 +70,16 @@ class ReviewScreenSnippet : AppCompatActivity() {
             screens.cropping.apply {
 
                 // Hide the reset button.
-                bottomBar.resetButton.visible = false
+                toolbar.resetButton.visible = false
             }
             // Retrieve the retake button configuration from the main configuration object.
             screens.review.apply {
 
                 // Show the retake button.
-                bottomBar.retakeButton.visible = true
+                toolbar.retakeButton.barButton.visible = true
 
                 // Configure the retake title color.
-                bottomBar.retakeButton.title.color = ScanbotColor(color = Color.Black)
+                toolbar.retakeButton.barButton.title.color = ScanbotColor(color = Color.Black)
             }
         }
 
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ScanningScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ScanningScreenSnippet.kt
index fdb0a536..2f285fa4 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ScanningScreenSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/ScanningScreenSnippet.kt
@@ -57,9 +57,9 @@ class ScanningScreenSnippet : AppCompatActivity() {
             // Controls whether to resume an existing draft session or start a new one when DOCUMENT_UUID is null.
             cleanScanningSession = true
 
-            // MARK: Configure the bottom bar and the bottom bar buttons.
-            // Set the background color of the bottom bar.
-            appearance.bottomBarBackgroundColor = ScanbotColor(value = "#C8193C")
+            // MARK: Configure the tool bar and the tool bar buttons.
+            // Set the background color of the tool bar.
+            appearance.toolbarBackgroundColor = ScanbotColor(value = "#C8193C")
 
             // Retrieve the camera screen configuration.
             screens.camera.apply {
@@ -95,21 +95,21 @@ class ScanningScreenSnippet : AppCompatActivity() {
                 userGuidance.statesTitles.captureManual = "The document is ready to be captured"
 
                 // Import button is used to import image from the gallery.
-                bottomBar.importButton.visible = true
-                bottomBar.importButton.title.visible = true
-                bottomBar.importButton.title.text = "Import"
+                toolbar.importButton.visible = true
+                toolbar.importButton.title.visible = true
+                toolbar.importButton.title.text = "Import"
 
                 // Configure the auto/manual snap button.
-                bottomBar.autoSnappingModeButton.title.visible = true
-                bottomBar.autoSnappingModeButton.title.text = "Auto"
-                bottomBar.manualSnappingModeButton.title.visible = true
-                bottomBar.manualSnappingModeButton.title.text = "Manual"
+                toolbar.autoSnappingModeButton.title.visible = true
+                toolbar.autoSnappingModeButton.title.text = "Auto"
+                toolbar.manualSnappingModeButton.title.visible = true
+                toolbar.manualSnappingModeButton.title.text = "Manual"
 
                 // Configure the torch off/on button.
-                bottomBar.torchOnButton.title.visible = true
-                bottomBar.torchOnButton.title.text = "On"
-                bottomBar.torchOffButton.title.visible = true
-                bottomBar.torchOffButton.title.text = "Off"
+                toolbar.torchOnButton.title.visible = true
+                toolbar.torchOnButton.title.text = "On"
+                toolbar.torchOffButton.title.visible = true
+                toolbar.torchOffButton.title.text = "Off"
 
 
                 // MARK: Configure the document capture feedback.
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/StandaloneCropScreenSnippet.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/StandaloneCropScreenSnippet.kt
index 60f8d2f7..6993bc1d 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/StandaloneCropScreenSnippet.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/StandaloneCropScreenSnippet.kt
@@ -23,7 +23,7 @@ import io.scanbot.sdk.docprocessing.Document
 import io.scanbot.sdk.ui_v2.common.ScanbotColor
 import io.scanbot.sdk.ui_v2.document.CroppingActivity
 import io.scanbot.sdk.ui_v2.document.DocumentScannerActivity
-import io.scanbot.sdk.ui_v2.document.configuration.CroppingConfiguration
+import io.scanbot.sdk.ui_v2.document.configuration.CroppingStandaloneConfiguration
 import io.scanbot.sdk.ui_v2.document.configuration.DocumentScanningFlow
 import io.scanbot.sdk.util.toImageRef
 
@@ -69,7 +69,7 @@ class StandaloneCropScreenSnippet : AppCompatActivity() {
         }
 
     // @Tag("Using Cropping UI")
-    private val croppingResult: ActivityResultLauncher<CroppingConfiguration> =
+    private val croppingResult: ActivityResultLauncher<CroppingStandaloneConfiguration> =
         registerForActivityResult(CroppingActivity.ResultContract()) { result ->
             result.onSuccess { result ->
                 // Retrieve the cropped document.
@@ -100,9 +100,9 @@ class StandaloneCropScreenSnippet : AppCompatActivity() {
         val page = document.pages.getOrNull(0) ?: return
         // Create the default configuration object.
         val configuration =
-            CroppingConfiguration(documentUuid = document.uuid, pageUuid = page.uuid).apply {
+            CroppingStandaloneConfiguration(documentUuid = document.uuid, pageUuid = page.uuid).apply {
                 // e.g disable the rotation feature.
-                cropping.bottomBar.rotateButton.visible = false
+                cropping.toolbar.rotateButton.visible = false
 
                 // e.g. configure various colors.
                 appearance.topBarBackgroundColor = ScanbotColor(color = Color.RED)
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/main/MainActivity.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/main/MainActivity.kt
index cb11c391..f40f798d 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/main/MainActivity.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/main/MainActivity.kt
@@ -113,7 +113,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun runMultiPageScanner() {
         val config = DocumentScanningFlow().apply {
-            this.screens.camera.bottomBar.shutterButton.innerColor = ScanbotColor(Color.RED)
+            this.screens.camera.toolbar.shutterButton.innerColor = ScanbotColor(Color.RED)
         }
         documentScannerResult.launch(config)
     }
diff --git a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/preview/SinglePagePreviewActivity.kt b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/preview/SinglePagePreviewActivity.kt
index c41e8265..fd3d765b 100644
--- a/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/preview/SinglePagePreviewActivity.kt
+++ b/document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/preview/SinglePagePreviewActivity.kt
@@ -34,7 +34,7 @@ import io.scanbot.sdk.docprocessing.Document
 import io.scanbot.sdk.docprocessing.Page
 import io.scanbot.sdk.imageprocessing.ParametricFilter
 import io.scanbot.sdk.ui_v2.document.CroppingActivity
-import io.scanbot.sdk.ui_v2.document.configuration.CroppingConfiguration
+import io.scanbot.sdk.ui_v2.document.configuration.CroppingStandaloneConfiguration
 import io.scanbot.sdk.usecases.documents.R
 
 class SinglePagePreviewActivity : AppCompatActivity(), FiltersListener, SaveListener,
@@ -58,7 +58,7 @@ class SinglePagePreviewActivity : AppCompatActivity(), FiltersListener, SaveList
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Default + job
 
-    private val croppingResult: ActivityResultLauncher<CroppingConfiguration> =
+    private val croppingResult: ActivityResultLauncher<CroppingStandaloneConfiguration> =
         registerForActivityResult(CroppingActivity.ResultContract()) { result ->
             result.onSuccess { result ->
                 document = scanbotSdk.documentApi.loadDocument(result.documentUuid).getOrNull()
@@ -160,7 +160,7 @@ class SinglePagePreviewActivity : AppCompatActivity(), FiltersListener, SaveList
         }
 
         val configuration =
-            CroppingConfiguration(documentUuid = document.uuid, pageUuid = page.uuid)
+            CroppingStandaloneConfiguration(documentUuid = document.uuid, pageUuid = page.uuid)
         croppingResult.launch(configuration)
     }