diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4d08305a170ea..7338b1ce520bf 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -114,7 +114,7 @@ sys-boot/grub -libzfs
 
 # Amy Liffey <amynka@gentoo.org> (2017-09-19)
 # [cuda] is unmasked in this profiles.
-media-libs/opencv -contrib_xfeatures2d
+media-libs/opencv -contribxfeatures2d
 
 # David Seifert <soap@gentoo.org> (2017-05-20)
 # cpyrit-cuda does not support GCC 4.9 or later
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 000ff03db337b..0cc0795144257 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -46,7 +46,7 @@ dev-qt/qtsql oci8
 
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
-media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
+media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 0e9e238f0ebff..2419bc770986b 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -121,7 +121,7 @@ net-p2p/deluge geoip
 
 # Amy Liffey <amynka@gentoo.org (2018-01-21)
 # dev-libs/cereal not keyworded for arm
-media-libs/opencv contrib_dnn
+media-libs/opencv contribdnn
 
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Moved from use.mask since they are flags local to one package.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index cef1785e54a7a..c46008969e66c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -186,7 +186,7 @@ sys-cluster/neutron haproxy
 dev-python/ipython notebook
 dev-python/networkx scipy
 dev-ruby/haml test
-media-libs/opencv contrib_dnn
+media-libs/opencv contribdnn
 net-analyzer/icinga2 classicui
 
 # Matthew Thode <prometheanfire@gentoo.org> (2018-02-16)
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index fdccdea60270e..d89fc52e588c8 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -40,7 +40,7 @@ virtual/notification-daemon gnome
 
 # Aaron Bauman <bman@gentoo.org> (2019-05-15)
 # packages for these USE flags fail tests
-media-libs/opencv contrib_cvv contrib_hdf contrib_sfm glog gstreamer
+media-libs/opencv contribcvv contribhdf contribsfm glog gstreamer
 
 # Mart Raudsepp <leio@gentoo.org> (2019-01-18)
 # Respective x11-drivers/ not tested and stable yet
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 5d31f0daff2a5..78ea5c5b80529 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -102,7 +102,7 @@ app-laptop/pbbuttonsd macbook
 
 # Amy Liffey <amynka@gentoo.org> (2017-09-19)
 # Requires [cuda] which is masked in most of the profiles.
-media-libs/opencv contrib_xfeatures2d
+media-libs/opencv contribxfeatures2d
 
 # Rick Farina <zerochaos@gentoo.org> (2017-05-11)
 # the needed deps are amd64/x86 only
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index ba2002551f506..856281f7b40f7 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -79,7 +79,7 @@ app-emulation/qemu capstone
 
 # Amy Liffey <amynka@gentoo.org (2018-01-21)
 # dev-libs/cereal not keyworded for ppc
-media-libs/opencv contrib_dnn
+media-libs/opencv contribdnn
 
 # Robin H. Johnson <robbat2@gentoo.org> (2017-11-10)
 # Masked for dependencies:
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 78c8a76399d97..c1b987d076a88 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -41,7 +41,7 @@ dev-qt/qtsql oci8
 
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
-media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
+media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 98e0390c6ee61..e8bf04fd0526d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -59,7 +59,7 @@ media-gfx/alembic arnold maya
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# media-libs/opencv[contrib,contrib_dnn], net-libs/libmediawiki,
+# media-libs/opencv[contrib,contribdnn], net-libs/libmediawiki,
 # net-libs/libkvkontakte all not stable anywhere.
 kde-apps/kipi-plugins mediawiki vkontakte
 media-gfx/digikam dnn vkontakte