diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfce2cb8..6e89908d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,9 +24,9 @@ bug fixes:
 
 new languages:
 
+*  bpy (Bishnupriya Manipuri) -- Vardhan
 *  kok (Konkani) -- Vardhan
 *  mi (Māori) -- Graham Oliver
-*  mni (Manipuri) -- Vardhan
 *  sd (Sindhi, Arabic script) -- Vardhan
 
 updated languages:
diff --git a/Makefile.am b/Makefile.am
index 451a54a5..0736c412 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,6 +358,7 @@ dictionaries: \
 	espeak-ng-data/az_dict \
 	espeak-ng-data/bg_dict \
 	espeak-ng-data/bn_dict \
+	espeak-ng-data/bpy_dict \
 	espeak-ng-data/ca_dict \
 	espeak-ng-data/cs_dict \
 	espeak-ng-data/cy_dict \
@@ -400,7 +401,6 @@ dictionaries: \
 	espeak-ng-data/mi_dict \
 	espeak-ng-data/mk_dict \
 	espeak-ng-data/ml_dict \
-	espeak-ng-data/mni_dict \
 	espeak-ng-data/mr_dict \
 	espeak-ng-data/ms_dict \
 	espeak-ng-data/mt_dict \
@@ -482,6 +482,12 @@ dictsource/bn_extra:
 espeak-ng-data/bn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bn_list dictsource/bn_rules dictsource/bn_extra
 	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bn && cd ..
 
+bpy: espeak-ng-data/bpy_dict
+dictsource/bpy_extra:
+	touch dictsource/bpy_extra
+espeak-ng-data/bpy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bpy_list dictsource/bpy_rules dictsource/bpy_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bpy && cd ..
+
 ca: espeak-ng-data/ca_dict
 dictsource/ca_extra:
 	touch dictsource/ca_extra
@@ -740,12 +746,6 @@ dictsource/ml_extra:
 espeak-ng-data/ml_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
 	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ml && cd ..
 
-mni: espeak-ng-data/mni_dict
-dictsource/mni_extra:
-	touch dictsource/mni_extra
-espeak-ng-data/mni_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mni_list dictsource/mni_rules dictsource/mni_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mni && cd ..
-
 mr: espeak-ng-data/mr_dict
 dictsource/mr_extra:
 	touch dictsource/mr_extra
diff --git a/dictsource/mni_list b/dictsource/bpy_list
similarity index 100%
rename from dictsource/mni_list
rename to dictsource/bpy_list
diff --git a/dictsource/mni_rules b/dictsource/bpy_rules
similarity index 100%
rename from dictsource/mni_rules
rename to dictsource/bpy_rules
diff --git a/espeak-ng-data/lang/inc/bpy b/espeak-ng-data/lang/inc/bpy
new file mode 100644
index 00000000..b63bc8d1
--- /dev/null
+++ b/espeak-ng-data/lang/inc/bpy
@@ -0,0 +1,2 @@
+name Bishnupriya Manipuri
+language bpy
diff --git a/espeak-ng-data/lang/sit/mni b/espeak-ng-data/lang/sit/mni
deleted file mode 100644
index da2cba12..00000000
--- a/espeak-ng-data/lang/sit/mni
+++ /dev/null
@@ -1,2 +0,0 @@
-name Manipuri
-language mni
diff --git a/phsource/phonemes b/phsource/phonemes
index 7c3ba0f3..aa028df1 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1146,7 +1146,7 @@ include ph_assamese
 phonemetable or bn
 include ph_oriya
 
-phonemetable mni bn
+phonemetable bpy bn
 include ph_manipuri
 
 phonemetable sd ur