diff --git a/Riot/Utils/Widgets/Widget.h b/Riot/Utils/Widgets/Widget.h
index c645e7e7a..9cc1e89ec 100644
--- a/Riot/Utils/Widgets/Widget.h
+++ b/Riot/Utils/Widgets/Widget.h
@@ -19,7 +19,7 @@
 #import <MatrixSDK/MatrixSDK.h>
 
 /**
- The `Widget` class represents scalar widget information.
+ The `Widget` class represents modular widget information.
  */
 @interface Widget : NSObject
 
diff --git a/Riot/Utils/Widgets/Widget.m b/Riot/Utils/Widgets/Widget.m
index 8bfc1574a..381e23c48 100644
--- a/Riot/Utils/Widgets/Widget.m
+++ b/Riot/Utils/Widgets/Widget.m
@@ -24,7 +24,7 @@
 {
     if (![widgetEvent.type isEqualToString:kWidgetEventTypeString])
     {
-        // The Widget class works only with scalar, aka "im.vector.modular.widgets", widgets
+        // The Widget class works only with modular, aka "im.vector.modular.widgets", widgets
         return nil;
     }
 
diff --git a/Riot/Utils/Widgets/WidgetManager.h b/Riot/Utils/Widgets/WidgetManager.h
index 3e20e5a32..4a0833e02 100644
--- a/Riot/Utils/Widgets/WidgetManager.h
+++ b/Riot/Utils/Widgets/WidgetManager.h
@@ -21,7 +21,7 @@
 #import "Widget.h"
 
 /**
- The type of matrix event used for scalar widgets.
+ The type of matrix event used for modular widgets.
  */
 FOUNDATION_EXPORT NSString *const kWidgetEventTypeString;
 
@@ -50,7 +50,7 @@ WidgetManagerErrorCode;
 
 
 /**
- The `WidgetManager` helps to handle scalar widgets.
+ The `WidgetManager` helps to handle modular widgets.
  */
 @interface WidgetManager : NSObject
 
@@ -80,7 +80,7 @@ WidgetManagerErrorCode;
 
 
 /**
- Add a scalar widget to a room.
+ Add a modular widget to a room.
 
  @param widgetId the id of the widget.
  @param widgetContent the widget content.
diff --git a/Riot/Utils/Widgets/WidgetManager.m b/Riot/Utils/Widgets/WidgetManager.m
index 19cdf3df1..ce390a05c 100644
--- a/Riot/Utils/Widgets/WidgetManager.m
+++ b/Riot/Utils/Widgets/WidgetManager.m
@@ -158,7 +158,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     }
 
     // Send a state event with the widget data
-    // TODO: This API will be shortly replaced by a pure scalar API
+    // TODO: This API will be shortly replaced by a pure modular API
     return [room sendStateEventOfType:kWidgetEventTypeString
                               content:widgetContent
                              stateKey:widgetId
@@ -181,7 +181,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     NSString *confId = [room.roomId substringWithRange:NSMakeRange(1, [room.roomId rangeOfString:@":"].location - 1)];
     confId = [confId stringByAppendingString:widgetSessionId];
 
-    // TODO: This url may come from scalar API
+    // TODO: This url may come from modular API
     // Note: this url can be used as is inside a web container (like iframe for Riot-web)
     // Riot-iOS does not directly use it but extracts params from it (see `[JitsiViewController openWidget:withVideo:]`)
     NSString *url = [NSString stringWithFormat:@"https://scalar-staging.riot.im/scalar/api/widgets/jitsi.html?confId=%@&isAudioConf=%@&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&email=$matrix_user_id@", confId, video ? @"false" : @"true"];
@@ -216,7 +216,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     }
 
     // Send a state event with an empty content to disable the widget
-    // TODO: This API will be shortly replaced by a pure scalar API
+    // TODO: This API will be shortly replaced by a pure modular API
     return [room sendStateEventOfType:kWidgetEventTypeString
                               content:@{}
                              stateKey:widgetId
diff --git a/Riot/ViewController/Widgets/JitsiViewController.h b/Riot/ViewController/Widgets/JitsiViewController.h
index f6368bc18..0d175de00 100644
--- a/Riot/ViewController/Widgets/JitsiViewController.h
+++ b/Riot/ViewController/Widgets/JitsiViewController.h
@@ -24,7 +24,7 @@
 
 /**
  The `JitsiViewController` is a VC for specifically handling a jitsi widget using the
- jitsi-meet iOS SDK instead of displaying it in a webview like other scalar widgets.
+ jitsi-meet iOS SDK instead of displaying it in a webview like other modular widgets.
  
  https://github.com/jitsi/jitsi-meet/tree/master/ios
  */