diff --git a/Riot/Managers/Widgets/WidgetManager.h b/Riot/Managers/Widgets/WidgetManager.h
index 09c2b2588..f5279a216 100644
--- a/Riot/Managers/Widgets/WidgetManager.h
+++ b/Riot/Managers/Widgets/WidgetManager.h
@@ -183,7 +183,7 @@ FOUNDATION_EXPORT NSString *const WidgetManagerErrorOpenIdTokenKey;
 /**
  Store the integration manager configuration for a user.
 
- @param the integration manager configuration.
+ @param config the integration manager configuration.
  @param userId the user id.
  */
 - (void)setConfig:(WidgetManagerConfig*)config forUser:(NSString*)userId;
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
index 78269f348..1b06d8cbe 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.h
+++ b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -173,7 +173,7 @@ UINavigationControllerDelegate
  Log out all the accounts without confirmation.
  Show the authentication screen on successful logout.
 
- @param sendLogoutRequest Indicate whether send logout request to homeserver.
+ @param sendLogoutServerRequest Indicate whether send logout request to homeserver.
  @param completion the block to execute at the end of the operation.
  */
 - (void)logoutSendingRequestServer:(BOOL)sendLogoutServerRequest
@@ -183,7 +183,7 @@ UINavigationControllerDelegate
  Present incoming key verification request to accept.
 
  @param incomingKeyVerificationRequest The incoming key verification request.
- @param The matrix session.
+ @param session The matrix session.
  @return Indicate NO if the key verification screen could not be presented.
  */
 - (BOOL)presentIncomingKeyVerificationRequest:(MXKeyVerificationRequest*)incomingKeyVerificationRequest
diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index a4e4151f7..8480205af 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -74,7 +74,7 @@
 /**
  init the segmentedViewController with a list of UIViewControllers.
  @param titles the section tiles
- @param viewControllers the list of viewControllers to display.
+ @param someViewControllers the list of viewControllers to display.
  @param defaultSelected index of the default selected UIViewController in the list.
  */
 - (void)initWithTitles:(NSArray*)titles viewControllers:(NSArray*)someViewControllers defaultSelected:(NSUInteger)defaultSelected
diff --git a/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
index a97402465..31d5ccaa9 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
@@ -31,7 +31,7 @@ extern NSString *const kRoomEncryptedDataBubbleCellTapOnEncryptionIcon;
 /**
  Return the icon displayed in front of an event in an encrypted room if needed.
  
- @param event the bubble component.
+ @param bubbleComponent the bubble component.
  */
 + (UIImage*)encryptionIconForBubbleComponent:(MXKRoomBubbleComponent *)bubbleComponent;
 
diff --git a/Riot/Modules/TabBar/MasterTabBarController.h b/Riot/Modules/TabBar/MasterTabBarController.h
index 6ef661948..1d5f41a12 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.h
+++ b/Riot/Modules/TabBar/MasterTabBarController.h
@@ -90,7 +90,7 @@
  
  @param roomId the room identifier.
  @param eventId if not nil, the room will be opened on this event.
- @param mxSession the matrix session in which the room should be available.
+ @param matrixSession the matrix session in which the room should be available.
  @param completion the block to execute at the end of the operation.
  */
 - (void)selectRoomWithId:(NSString*)roomId andEventId:(NSString*)eventId inMatrixSession:(MXSession*)matrixSession completion:(void (^)(void))completion;
@@ -113,7 +113,7 @@
  Open a GroupDetailsViewController to display the information of the provided group.
  
  @param group
- @param mxSession the matrix session in which the group should be available.
+ @param matrixSession the matrix session in which the group should be available.
  */
 - (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession;