diff --git a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
index e7601015..780f8829 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
@@ -117,7 +117,7 @@
             spinnerHeight = constraint.constant
             loadingSpinnerHeightConstraint?.constant = 0
             loadingSpinnerHeightConstraint?.isActive = true
-            loadingSpinner.pauseSpinner()
+            loadingSpinner.pause()
         }
     }
     
@@ -326,7 +326,7 @@
                 guard let self = self,
                       let loadingImageName = self.currentImageName, loadingImageName == imageName else { return }
                 self.isFallbackImage = isFallbackImage
-                self.loadingSpinner.pauseSpinner()
+                self.loadingSpinner.pause()
                 let layoutWillChange = self.shouldNotifyDelegateOnUpdate ? self.layoutWillChange(width: self.currentImageWidth, height: self.currentImageHeight, size: image?.size) : false
                 self.addConstraints(width: width, height: height, size: image?.size)
                 self.loadingSpinnerHeightConstraint?.constant = 0
@@ -359,7 +359,7 @@
                         return
                     }
                     self?.loadingSpinnerHeightConstraint?.constant = 0
-                    self?.loadingSpinner.pauseSpinner()
+                    self?.loadingSpinner.pause()
                     if flipImage, let cgImage = image.cgImage {
                         self?.imageView.image = UIImage(cgImage: cgImage, scale: image.scale, orientation: UIImage.Orientation.upMirrored)
                     } else {
diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
index 8e2923be..d3a91920 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
@@ -122,7 +122,7 @@ extension WebView : WKUIDelegate {
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         // hide loading
         overLayer.isHidden = true
-        loadingSpinner.pauseSpinner()
+        loadingSpinner.pause()
         
         //update webview's heigth when webview is ready
         if !dynamicHeight {
@@ -159,7 +159,7 @@ extension WebView : WKUIDelegate {
         //actually no error handle page show in webview. We can handle the error display view by our self.
         //or stop loading by default
         overLayer.isHidden = true
-        loadingSpinner.pauseSpinner()
+        loadingSpinner.pause()
     }
     
 }
diff --git a/MVMCoreUI/Legacy/Views/MFLoadingSpinner+VDS.swift b/MVMCoreUI/Legacy/Views/MFLoadingSpinner+VDS.swift
index f058699c..f58a1395 100644
--- a/MVMCoreUI/Legacy/Views/MFLoadingSpinner+VDS.swift
+++ b/MVMCoreUI/Legacy/Views/MFLoadingSpinner+VDS.swift
@@ -14,28 +14,27 @@ extension MFLoadingSpinner {
         subviews.first as? Loader
     }
     
-    @objc(setUpCircle:)
-    open func setUpCircle(strokeColor: UIColor?) {
+    @objc open func setSurface(_ strokeColor: UIColor?) {
         if let strokeColor {
             loader?.surface = strokeColor.isDark() ? .light : .dark
         }
     }
     
-    @objc open func pauseSpinner() {
+    @objc open func pause() {
         loader?.isActive = false
     }
     
-    @objc open func resumeSpinner() {
+    @objc open func resume() {
         loader?.isActive = true
     }
     
-    @objc open func resumeSpinnerAfterDelay() {
+    @objc open func resumeAfterDelay() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
             self?.loader?.isActive = true
         }
     }
     
-    @objc open func pinWidthAndHeight() -> NSDictionary? {
+    @objc open func pin() -> NSDictionary? {
         guard let size = loader?.size else { return nil }
         return NSLayoutConstraint.constraintPinView(self, heightConstraint: true, heightConstant: CGFloat(size), widthConstraint: true, widthConstant: CGFloat(size)) as NSDictionary?
     }
diff --git a/MVMCoreUI/Legacy/Views/MFLoadingSpinner.h b/MVMCoreUI/Legacy/Views/MFLoadingSpinner.h
index 6e4bb55c..6a44f743 100644
--- a/MVMCoreUI/Legacy/Views/MFLoadingSpinner.h
+++ b/MVMCoreUI/Legacy/Views/MFLoadingSpinner.h
@@ -12,6 +12,17 @@
 
 -(void)setUpCircle;
 
+-(void)setUpCircle:(nullable UIColor *)strokeColor;
+
 -(void)changeColor:(nullable UIColor *)strokeColor;
 
+- (void)pauseSpinner;
+
+- (void)resumeSpinner;
+
+// Starts the spinner after a slight delay.
+- (void)resumeSpinnerAfterDelay;
+
+- (nullable NSDictionary *)pinWidthAndHeight;
+
 @end
diff --git a/MVMCoreUI/Legacy/Views/MFLoadingSpinner.m b/MVMCoreUI/Legacy/Views/MFLoadingSpinner.m
index 4cb309c2..388416e0 100644
--- a/MVMCoreUI/Legacy/Views/MFLoadingSpinner.m
+++ b/MVMCoreUI/Legacy/Views/MFLoadingSpinner.m
@@ -7,7 +7,6 @@
 //
 
 #import "MFLoadingSpinner.h"
-#import "NSLayoutConstraint+MFConvenience.h"
 #import <VDS/VDS.h>
 #import <MVMCoreUI/MVMCoreUI-Swift.h>
 
@@ -49,11 +48,31 @@
 }
 
 -(void)setUpCircle {
-    [self setUpCircle:[UIColor blackColor]];
+    [self setSurface: UIColor.blackColor];
 }
 
--(void)changeColor:(UIColor *)strokeColor {
-    [self setUpCircle: strokeColor];
+-(void)setUpCircle:(nullable UIColor *)strokeColor {
+    [self setSurface: strokeColor];
 }
 
+-(void)changeColor:(nullable UIColor *)strokeColor {
+    [self setSurface: strokeColor];
+}
+
+- (void)pauseSpinner {
+    [self pause];
+}
+
+- (void)resumeSpinner {
+    [self resume];
+}
+
+// Starts the spinner after a slight delay.
+- (void)resumeSpinnerAfterDelay {
+    [self resumeAfterDelay];
+}
+
+- (nullable NSDictionary *)pinWidthAndHeight {
+    return [self pin];
+}
 @end