diff --git a/minerva.less/minerva.variables.less b/minerva.less/minerva.variables.less
index 754b58d0d..f721b3262 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -15,8 +15,10 @@
 @grayLight: @colorGray12;
 @grayLightest: @colorGray14;
 
-@wgMFDeviceWidthMobileSmall: 320px;
-@wgMFDeviceWidthDesktop: 1000px;
+@width-breakpoint-mobile: 320px;
+@width-breakpoint-desktop: 1000px;
+// For backwards compatibility with MobileFrontend skinStyles
+@wgMFDeviceWidthDesktop: @width-breakpoint-desktop;
 
 @skinContentBgColor: #fff;
 
@@ -85,7 +87,7 @@
 @contentPaddingTablet: 3.35em;
 
 // note since content does not use view border box we have to include padding.
-@contentMaxWidthTablet: @wgMFDeviceWidthDesktop - ( 2 * @contentPaddingTablet );
+@contentMaxWidthTablet: @width-breakpoint-desktop - ( 2 * @contentPaddingTablet );
 @contentTopPadding: 1.6em;
 
 // Wiki specific variables
diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index 2e96bd948..07422029e 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -112,7 +112,7 @@
 }
 
 // On small devices that don't support Javascript, hide the page actions bar
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
 	.client-nojs {
 		#page-actions {
 			display: none;
diff --git a/resources/skins.minerva.content.styles/main.less b/resources/skins.minerva.content.styles/main.less
index dc12d751c..7e4b9822f 100644
--- a/resources/skins.minerva.content.styles/main.less
+++ b/resources/skins.minerva.content.styles/main.less
@@ -28,7 +28,7 @@ body {
 	word-wrap: break-word;
 }
 
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
 	body {
 		font-size: 0.8em;
 	}
diff --git a/resources/skins.minerva.tablet.styles/common.less b/resources/skins.minerva.tablet.styles/common.less
index e5f4e6daa..ba873023f 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -119,7 +119,7 @@ A file for css that optimises the Minerva skin on larger devices.
 	}
 }
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
 	// FIXME: Zero should use banner-container class or better - append to banner-container
 	#mw-mf-page-center .mw-mf-banner,
 	.banner-container,
diff --git a/skinStyles/mobile.languages.structured/LanguageOverlay.less b/skinStyles/mobile.languages.structured/LanguageOverlay.less
index f1fd90372..6e96b07bd 100644
--- a/skinStyles/mobile.languages.structured/LanguageOverlay.less
+++ b/skinStyles/mobile.languages.structured/LanguageOverlay.less
@@ -1,6 +1,6 @@
 @import 'minerva.variables';
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
 	.language-overlay {
 		.overlay-content {
 			margin: 0;
diff --git a/skinStyles/mobile.pointerOverlay/minerva.less b/skinStyles/mobile.pointerOverlay/minerva.less
index 9f1b5b011..47bea8526 100644
--- a/skinStyles/mobile.pointerOverlay/minerva.less
+++ b/skinStyles/mobile.pointerOverlay/minerva.less
@@ -7,7 +7,7 @@
 	// can point to anything in the containing content area and avoid
 	// padding issues such as https://phabricator.wikimedia.org/F287611
 	#mw-mf-page-center .pointer-overlay {
-		max-width: @wgMFDeviceWidthDesktop;
+		max-width: @width-breakpoint-desktop;
 	}
 }
 
diff --git a/skinStyles/mobile.search/SearchOverlay.less b/skinStyles/mobile.search/SearchOverlay.less
index 8d3eb49e7..e0232f4e5 100644
--- a/skinStyles/mobile.search/SearchOverlay.less
+++ b/skinStyles/mobile.search/SearchOverlay.less
@@ -45,7 +45,7 @@
 	}
 }
 
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media all and ( min-width: @width-breakpoint-desktop ) {
 	.search-overlay {
 		.overlay-content {
 			// align with the search form
diff --git a/skinStyles/mobile.startup/Overlay.less b/skinStyles/mobile.startup/Overlay.less
index 5f3c6411c..c0b123c16 100644
--- a/skinStyles/mobile.startup/Overlay.less
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -24,7 +24,7 @@
 	}
 }
 
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media all and ( min-width: @width-breakpoint-desktop ) {
 	.overlay-header {
 		// Make sure the close button and secondary button icon images are aligned
 		// with the content.