diff --git a/device-oriole.mk b/device-oriole.mk
index 1048193..eaed050 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -92,22 +92,19 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\
-	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\
-	device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-r27.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r27.zvoice:product/tts/google/de-de/de-de-x-multi-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-multi-r24.zvoice:product/tts/google/it-it/it-it-x-multi-r24.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r27.zvoice:product/tts/google/es-es/es-es-x-multi-r27.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-wavernn-r27.zvoice
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
diff --git a/device-raven.mk b/device-raven.mk
index 225f153..23f8f26 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -91,22 +91,19 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\
-	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\
-	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\
-	device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\
-	device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\
-	device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-r27.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r27.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r27.zvoice:product/tts/google/de-de/de-de-x-multi-r27.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-wavernn-r27.zvoice:product/tts/google/de-de/de-de-x-multi-wavernn-r27.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-multi-r24.zvoice:product/tts/google/it-it/it-it-x-multi-r24.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r27.zvoice:product/tts/google/es-es/es-es-x-multi-r27.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-wavernn-r27.zvoice:product/tts/google/es-es/es-es-x-multi-wavernn-r27.zvoice
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
diff --git a/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice b/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice
new file mode 100644
index 0000000..174f958
--- /dev/null
+++ b/tts/de-de/de-de-x-multi-darwinn-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/de-de/de-de-x-multi-r24.zvoice b/tts/de-de/de-de-x-multi-r24.zvoice
deleted file mode 100644
index 44169eb..0000000
--- a/tts/de-de/de-de-x-multi-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/de-de/de-de-x-multi-r27.zvoice b/tts/de-de/de-de-x-multi-r27.zvoice
new file mode 100644
index 0000000..aceddfe
--- /dev/null
+++ b/tts/de-de/de-de-x-multi-r27.zvoice
Binary files differ
diff --git a/tts/de-de/de-de-x-multi-wavernn-r27.zvoice b/tts/de-de/de-de-x-multi-wavernn-r27.zvoice
new file mode 100644
index 0000000..d4b54d6
--- /dev/null
+++ b/tts/de-de/de-de-x-multi-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-ana-r23.zvoice b/tts/es-es/es-es-x-ana-r23.zvoice
deleted file mode 100644
index d8d8dcc..0000000
--- a/tts/es-es/es-es-x-ana-r23.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice b/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice
new file mode 100644
index 0000000..8bc7604
--- /dev/null
+++ b/tts/es-es/es-es-x-multi-darwinn-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-r23.zvoice b/tts/es-es/es-es-x-multi-r23.zvoice
deleted file mode 100644
index 552c5a4..0000000
--- a/tts/es-es/es-es-x-multi-r23.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-r27.zvoice b/tts/es-es/es-es-x-multi-r27.zvoice
new file mode 100644
index 0000000..cd0c12c
--- /dev/null
+++ b/tts/es-es/es-es-x-multi-r27.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-wavernn-r27.zvoice b/tts/es-es/es-es-x-multi-wavernn-r27.zvoice
new file mode 100644
index 0000000..3ebcaa5
--- /dev/null
+++ b/tts/es-es/es-es-x-multi-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice
new file mode 100644
index 0000000..9297b10
--- /dev/null
+++ b/tts/fr-fr/fr-fr-x-multi-darwinn-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r24.zvoice b/tts/fr-fr/fr-fr-x-multi-r24.zvoice
deleted file mode 100644
index 0c89087..0000000
--- a/tts/fr-fr/fr-fr-x-multi-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-r27.zvoice
new file mode 100644
index 0000000..a5120b0
--- /dev/null
+++ b/tts/fr-fr/fr-fr-x-multi-r27.zvoice
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice b/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice
new file mode 100644
index 0000000..7c00516
--- /dev/null
+++ b/tts/fr-fr/fr-fr-x-multi-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-amb-r22.zvoice b/tts/it-it/it-it-x-amb-r22.zvoice
deleted file mode 100644
index 3b9ebe1..0000000
--- a/tts/it-it/it-it-x-amb-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-ita-r22.zvoice b/tts/it-it/it-it-x-ita-r22.zvoice
deleted file mode 100644
index 59a9215..0000000
--- a/tts/it-it/it-it-x-ita-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itb-r22.zvoice b/tts/it-it/it-it-x-itb-r22.zvoice
deleted file mode 100644
index 576677e..0000000
--- a/tts/it-it/it-it-x-itb-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itc-r22.zvoice b/tts/it-it/it-it-x-itc-r22.zvoice
deleted file mode 100644
index 6138452..0000000
--- a/tts/it-it/it-it-x-itc-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-itd-r22.zvoice b/tts/it-it/it-it-x-itd-r22.zvoice
deleted file mode 100644
index 3c2a55b..0000000
--- a/tts/it-it/it-it-x-itd-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-kda-r22.zvoice b/tts/it-it/it-it-x-kda-r22.zvoice
deleted file mode 100644
index f2f1ac6..0000000
--- a/tts/it-it/it-it-x-kda-r22.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/it-it/it-it-x-multi-r24.zvoice b/tts/it-it/it-it-x-multi-r24.zvoice
new file mode 100644
index 0000000..240e7fb
--- /dev/null
+++ b/tts/it-it/it-it-x-multi-r24.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-htm-r24.zvoice b/tts/ja-jp/ja-jp-x-htm-r24.zvoice
deleted file mode 100644
index ebfb91b..0000000
--- a/tts/ja-jp/ja-jp-x-htm-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jaa-r24.zvoice b/tts/ja-jp/ja-jp-x-jaa-r24.zvoice
deleted file mode 100644
index bf2accc..0000000
--- a/tts/ja-jp/ja-jp-x-jaa-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jab-r24.zvoice b/tts/ja-jp/ja-jp-x-jab-r24.zvoice
deleted file mode 100644
index 9d1ed20..0000000
--- a/tts/ja-jp/ja-jp-x-jab-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jac-r24.zvoice b/tts/ja-jp/ja-jp-x-jac-r24.zvoice
deleted file mode 100644
index e445157..0000000
--- a/tts/ja-jp/ja-jp-x-jac-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jad-r24.zvoice b/tts/ja-jp/ja-jp-x-jad-r24.zvoice
deleted file mode 100644
index be3be2a..0000000
--- a/tts/ja-jp/ja-jp-x-jad-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-mfk-r24.zvoice b/tts/ja-jp/ja-jp-x-mfk-r24.zvoice
deleted file mode 100644
index e7dca7a..0000000
--- a/tts/ja-jp/ja-jp-x-mfk-r24.zvoice
+++ /dev/null
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice
new file mode 100644
index 0000000..97b4f51
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-multi-darwinn-wavernn-r27.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-multi-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-r27.zvoice
new file mode 100644
index 0000000..651d4ef
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-multi-r27.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice b/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice
new file mode 100644
index 0000000..66471c1
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-multi-wavernn-r27.zvoice
Binary files differ