Fix UNOIDL interface method parameter identifiers

UNOIDL identifiers starting with a lowercase letter and containing underscores
are reserved for the implementation.  It would be good to be able to enforce
that in code parsing UNOIDL files, but some existing identifiers violate that.
So at least change any violating method parameter identifiers here.  While that
is theoretically an incompatible change for published interfaces, it practically
does not matter at all.

Change-Id: I5eff17b5dd5e2e92984184127c4fe1712d62c9dd

22 files changed, 89 insertions, 89 deletions

diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl
index 4f7aa5012671..722a00126bb7 100644
--- a/offapi/com/sun/star/awt/XAnimatedImages.idl
+++ b/offapi/com/sun/star/awt/XAnimatedImages.idl
@@ -70,17 +70,17 @@ interface XAnimatedImages
 
     /** returns the URLs of the image set with the given index
 
-        @param i_index
+        @param iIndex
             the index of the set those image URLs are to be retrieved. Must be greater than or equal to <code>0</code>,
             and smaller than the value returned by getImageSetCount().
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if the <code>i_index</code> is not a valid index.
+            if the <code>iIndex</code> is not a valid index.
     */
     sequence< string >
         getImageSet
         (
-            [in] long i_index
+            [in] long iIndex
         )
         raises
         (
@@ -89,20 +89,20 @@ interface XAnimatedImages
 
     /** sets the URLs of the image set with the given index
 
-        @param i_index
+        @param iIndex
             the index at which a new image set should be inserted. Must be greater than or equal to <code>0</code>,
             and smaller than or equal to the value returned by getImageSetCount().
-        @param i_imageURLs
+        @param iImageURLs
             the URLs for the images for the given set. Will be resolved using a com::sun::star::graphic::GraphicProvider.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if the <code>i_index</code> is not a valid index.
+            if the <code>iIndex</code> is not a valid index.
     */
     void
         insertImageSet
         (
-            [in] long i_index,
-            [in] sequence< string > i_imageURLs
+            [in] long iIndex,
+            [in] sequence< string > iImageURLs
         )
         raises
         (
@@ -111,21 +111,21 @@ interface XAnimatedImages
 
     /** replaces the image set given by index with a new one
 
-        @param i_index
+        @param iIndex
             the index of the set those image URLs are to be replaced. Must be greater than or equal to <code>0</code>,
             and smaller than the value returned by getImageSetCount().
 
-        @param i_imageURLs
+        @param iImageURLs
             the URLs for the images for the given set. Will be resolved using a com::sun::star::graphic::GraphicProvider.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if the <code>i_index</code> is not a valid index.
+            if the <code>iIndex</code> is not a valid index.
     */
     void
         replaceImageSet
         (
-            [in] long i_index,
-            [in] sequence< string > i_imageURLs
+            [in] long iIndex,
+            [in] sequence< string > iImageURLs
         )
         raises
         (
@@ -135,17 +135,17 @@ interface XAnimatedImages
 
     /** removes the image set with the given index
 
-        @param i_index
+        @param iIndex
             the index of the set to remove. Must be greater than or equal to <code>0</code>,
             and smaller than the value returned by getImageSetCount().
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if the <code>i_index</code> is not a valid index.
+            if the <code>iIndex</code> is not a valid index.
     */
     void
         removeImageSet
         (
-            [in] long i_index
+            [in] long iIndex
         )
         raises
         (
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
index 0249747ef323..da4a4b1afa82 100644
--- a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -36,10 +36,10 @@ module chart2
 interface XDefaultSizeTransmitter : ::com::sun::star::uno::XInterface
 {
     /** set a default size
-        @param aSize_100TH_MM
+        @param aSize100ThMm
             specifies a size in hundredth mm.
      */
-    void setDefaultSize( [in] ::com::sun::star::awt::Size aSize_100TH_MM );
+    void setDefaultSize( [in] ::com::sun::star::awt::Size aSize100ThMm );
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 793690ec4c8b..929db7df8eea 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -44,19 +44,19 @@ interface XDocumentEventBroadcaster
 {
     /** registers a listener which is notified about document events
 
-        @param _Listener
+        @param Listener
             the listener to register. The behavior of the method is undefined this listener
             is `NULL`.
     */
-    void    addDocumentEventListener( [in] XDocumentEventListener _Listener );
+    void    addDocumentEventListener( [in] XDocumentEventListener Listener );
 
     /** revokes a listener which has previously been registered to be notified about document events.
 
-        @param _Listener
+        @param Listener
             the listener to revoke. The behavior of the method is undefined this listener
             is `NULL`.
     */
-    void    removeDocumentEventListener( [in] XDocumentEventListener _Listener );
+    void    removeDocumentEventListener( [in] XDocumentEventListener Listener );
 
     /** causes the broadcaster to notify all registered listeners of the given event
 
@@ -71,15 +71,15 @@ interface XDocumentEventBroadcaster
         their own discretion. Again, in this case they're encouraged to document this in their service
         contract.</p>
 
-        @param _EventName
+        @param EventName
             the name of the event to be notified.
-        @param _ViewController
+        @param ViewController
             the view/controller which the event applies to. May be `NULL`
-        @param _Supplement
+        @param Supplement
             supplemental information related to the event.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
-            if _EventName is empty, or if _EventName is not supported by the
+            if EventName is empty, or if EventName is not supported by the
             document implementation.
 
         @throws ::com::sun::star::lang::NoSupportException
@@ -88,9 +88,9 @@ interface XDocumentEventBroadcaster
             be unable to fill in the <code>Source</code> member of the DocumentEvent instance.
     */
     void    notifyDocumentEvent(
-                [in] string _EventName,
-                [in] ::com::sun::star::frame::XController2 _ViewController,
-                [in] any _Supplement
+                [in] string EventName,
+                [in] ::com::sun::star::frame::XController2 ViewController,
+                [in] any Supplement
             )
             raises ( ::com::sun::star::lang::IllegalArgumentException,
                      ::com::sun::star::lang::NoSupportException );
diff --git a/offapi/com/sun/star/document/XUndoManager.idl b/offapi/com/sun/star/document/XUndoManager.idl
index bd748f5f6dee..cfe5645ed5ff 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -82,7 +82,7 @@ interface XUndoManager
 
     /** enters a new undo context.
 
-        <p>A new undo action will be added to the undo stack, with the title given as <code>i_title</code>. As long
+        <p>A new undo action will be added to the undo stack, with the title given as <code>iTitle</code>. As long
         as the context is not left, every undo action added to the stack will be treated as sub action. This means
         it will not be directly accessible at the Undo manager, not appear in any user interface, and cannot be
         separately undone or re-done.</p>
@@ -96,7 +96,7 @@ interface XUndoManager
         @see leaveUndoContext
     */
     void    enterUndoContext(
-                [in] string i_title
+                [in] string iTitle
             );
 
     /** enters a new undo context, creating a hidden undo action.
@@ -167,7 +167,7 @@ interface XUndoManager
             if the given undo action is `NULL`.
     */
     void    addUndoAction(
-                [in] XUndoAction i_action
+                [in] XUndoAction iAction
             )
             raises( ::com::sun::star::lang::IllegalArgumentException );
 
@@ -309,13 +309,13 @@ interface XUndoManager
     /** adds a listener to be notified of changes in the Undo/Redo stacks.
     */
     void    addUndoManagerListener(
-                [in] XUndoManagerListener i_listener
+                [in] XUndoManagerListener iListener
             );
 
     /** removes a previously added listener
     */
     void    removeUndoManagerListener(
-                [in] XUndoManagerListener i_listener
+                [in] XUndoManagerListener iListener
             );
 };
 
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl b/offapi/com/sun/star/document/XUndoManagerListener.idl
index 34f394308cd1..aacae1390615 100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
@@ -41,35 +41,35 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 
         @see XUndoManager::addUndoAction
     */
-    void    undoActionAdded( [in] UndoManagerEvent i_event );
+    void    undoActionAdded( [in] UndoManagerEvent iEvent );
 
     /** is called when the top-most action of the undo stack has been undone.
 
         @see XUndoManager::undo
     */
-    void    actionUndone( [in] UndoManagerEvent i_event );
+    void    actionUndone( [in] UndoManagerEvent iEvent );
 
     /** is called when the top-most action of the Redo stack has been re-applied.
 
         @see XUndoManager::redo
     */
-    void    actionRedone( [in] UndoManagerEvent i_event );
+    void    actionRedone( [in] UndoManagerEvent iEvent );
 
     /** is called when both the Undo and the Redo stack have been cleared from all Undo actions.
 
         @see XUndoManager::clear
     */
-    void    allActionsCleared( [in] ::com::sun::star::lang::EventObject i_event );
+    void    allActionsCleared( [in] ::com::sun::star::lang::EventObject iEvent );
 
     /** is called when the Redo stack has been cleared.
 
         @see XUndoManager::clearRedo
     */
-    void    redoActionsCleared( [in] ::com::sun::star::lang::EventObject i_event );
+    void    redoActionsCleared( [in] ::com::sun::star::lang::EventObject iEvent );
 
     /** called when the complete undo manager has been reset
     */
-    void    resetAll( [in] ::com::sun::star::lang::EventObject i_event );
+    void    resetAll( [in] ::com::sun::star::lang::EventObject iEvent );
 
     /** is called when a new Undo context has been entered.
 
@@ -79,7 +79,7 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 
         @see XUndoManager::enterUndoContext
     */
-    void    enteredContext( [in] UndoManagerEvent i_event );
+    void    enteredContext( [in] UndoManagerEvent iEvent );
 
     /** is called when a new hidden Undo context has been entered.
 
@@ -89,7 +89,7 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 
         @see XUndoManager::enterUndoContext
     */
-    void    enteredHiddenContext( [in] UndoManagerEvent i_event );
+    void    enteredHiddenContext( [in] UndoManagerEvent iEvent );
 
     /** is called when an Undo context has been left.
 
@@ -101,7 +101,7 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
         @see leftHiddenUndocontext
         @see cancelledContext
     */
-    void    leftContext( [in] UndoManagerEvent i_event );
+    void    leftContext( [in] UndoManagerEvent iEvent );
 
     /** is calledn when a hidden Undo context has been left.
 
@@ -112,7 +112,7 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
         @see leftContext
         @see cancelledContext
     */
-    void    leftHiddenContext( [in] UndoManagerEvent i_event );
+    void    leftHiddenContext( [in] UndoManagerEvent iEvent );
 
     /** is called when an Undo context has been left, but no actions have been added within this context.
 
@@ -123,7 +123,7 @@ interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
         @see leftContext
         @see leftHiddenContext
     */
-    void    cancelledContext( [in] UndoManagerEvent i_event );
+    void    cancelledContext( [in] UndoManagerEvent iEvent );
 };
 
 
diff --git a/offapi/com/sun/star/form/XGridControl.idl b/offapi/com/sun/star/form/XGridControl.idl
index 222ec000a87a..64429682eb1e 100644
--- a/offapi/com/sun/star/form/XGridControl.idl
+++ b/offapi/com/sun/star/form/XGridControl.idl
@@ -41,11 +41,11 @@ interface XGridControl
     /** registers a listener which is to be notified about state changes in
         the grid control
     */
-    void    addGridControlListener( [in] XGridControlListener _listener );
+    void    addGridControlListener( [in] XGridControlListener listener );
 
     /** revokes a previously registered grid control listener
     */
-    void    removeGridControlListener( [in] XGridControlListener _listener );
+    void    removeGridControlListener( [in] XGridControlListener listener );
 
     /// provides access to the data in the control, even in non-current rows
     interface XGridFieldDataSupplier;
diff --git a/offapi/com/sun/star/form/XGridControlListener.idl b/offapi/com/sun/star/form/XGridControlListener.idl
index 01f382db4208..faced14718a2 100644
--- a/offapi/com/sun/star/form/XGridControlListener.idl
+++ b/offapi/com/sun/star/form/XGridControlListener.idl
@@ -36,7 +36,7 @@ interface XGridControlListener : ::com::sun::star::lang::XEventListener
     /** called when the current column in a grid control changed
         @see XGrid::getCurrentColumnPosition
     */
-    void    columnChanged( [in] ::com::sun::star::lang::EventObject _event );
+    void    columnChanged( [in] ::com::sun::star::lang::EventObject event );
 };
 
 
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index 85c7c784a471..6a2234bb87cc 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -73,11 +73,11 @@ interface XFilterController
         <p>Registering the same listener multiple times results in multiple notifications of the same event,
         and also requires multiple revocations of the listener.
     */
-    void    addFilterControllerListener( [in] XFilterControllerListener _Listener );
+    void    addFilterControllerListener( [in] XFilterControllerListener Listener );
 
     /** revokes a listener which was previously registered to be notified of certain changes in the form based filter.
     */
-    void    removeFilterControllerListener( [in] XFilterControllerListener _Listener );
+    void    removeFilterControllerListener( [in] XFilterControllerListener Listener );
 
     /** is the number of <em>filter components</em>, or filter controls, which the filter controller is responsible
         for.
@@ -99,22 +99,22 @@ interface XFilterController
 
     /** sets a given <em>predicate expression</em>
 
-        @param _Component
+        @param Component
             denotes the filter component whose expression is to be set. Must be greater than or equal to 0, and smaller than
             #FilterComponents.
 
-        @param _Term
+        @param Term
             denotes the <em>disjunctive term</em> in which the expression is to be set. Must be greater than or equal to 0,
             and smaller than #DisjunctiveTerms.
 
-        @param _PredicateExpression
+        @param PredicateExpression
             denotes the <em>predicate expression</em> to set for the given filter component in the given term.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if one of the indexes is out of the allowed range
     */
     void
-        setPredicateExpression( [in] long _Component, [in] long _Term, [in] string _PredicateExpression )
+        setPredicateExpression( [in] long Component, [in] long Term, [in] string PredicateExpression )
             raises( ::com::sun::star::lang::IndexOutOfBoundsException );
 
     /** retrieves the filter component with the given index.
@@ -123,17 +123,17 @@ interface XFilterController
         to obtain the database column which the filter control works on, by examining the control model's <code>BoundField</code>
         property.</p>
 
-        @param _Component
+        @param Component
             denotes the index of the filter component whose control should be obtained. Must be greater than or equal to 0,
             and smaller than #FilterComponents.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if _Component is out of the allowed range.
+            if Component is out of the allowed range.
 
         @see ::com::sun::star::form::DataAwareControlModel::BoundField
     */
     ::com::sun::star::awt::XControl
-        getFilterComponent( [in] long _Component )
+        getFilterComponent( [in] long Component )
             raises( ::com::sun::star::lang::IndexOutOfBoundsException );
 
     /** retrieves the entirety of the <em>predicate expressions</em> represented by the filter controller.
@@ -146,15 +146,15 @@ interface XFilterController
 
     /** removes a given <em>disjunctive term</em>
 
-        @param _Term
+        @param Term
             the index of the term to remove. Must be greater than or equal to 0, and smaller than
             #DisjunctiveTerms.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
-            if _Term is out of the allowed range.
+            if Term is out of the allowed range.
     */
     void
-        removeDisjunctiveTerm( [in] long _Term )
+        removeDisjunctiveTerm( [in] long Term )
             raises( ::com::sun::star::lang::IndexOutOfBoundsException );
 
     /** appends an empty disjunctive term to the list of terms.
diff --git a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
index bc688cb137de..448aa0b0c09e 100644
--- a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
@@ -44,7 +44,7 @@ interface XFilterControllerListener : ::com::sun::star::lang::XEventListener
 
         <p>FilterEvent::PredicateExpression is the new <em>predicate expressions</em>.</p>
     */
-    void    predicateExpressionChanged( [in] FilterEvent _Event );
+    void    predicateExpressionChanged( [in] FilterEvent Event );
 
     /** is fired when a <em>disjunctive term</em> was removed from the filter of the filter controller.
 
@@ -54,7 +54,7 @@ interface XFilterControllerListener : ::com::sun::star::lang::XEventListener
         <p>FilterEvent::FilterComponent and FilterEvent::PredicateExpression are not
         used for this event type.</p>
     */
-    void    disjunctiveTermRemoved( [in] FilterEvent _Event );
+    void    disjunctiveTermRemoved( [in] FilterEvent Event );
 
     /** is fired when a <em>disjunctive term</em> was added to the filter of the filter controller.
 
@@ -64,7 +64,7 @@ interface XFilterControllerListener : ::com::sun::star::lang::XEventListener
         <p>FilterEvent::FilterComponent and FilterEvent::PredicateExpression are not
         used for this event type.</p>
     */
-    void    disjunctiveTermAdded( [in] FilterEvent _Event );
+    void    disjunctiveTermAdded( [in] FilterEvent Event );
 };
 
 
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 35bdf22793dc..f71de8d45992 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -338,12 +338,12 @@ interface XFormController
     /** adds the specified listener to receive notifications whenever the activation state of
         the controller changes.
      */
-    void addActivateListener( [in] ::com::sun::star::form::XFormControllerListener _Listener );
+    void addActivateListener( [in] ::com::sun::star::form::XFormControllerListener Listener );
 
     /** removes the specified listener from the list of components to receive notifications whenever the activation
         state of the controller changes.
      */
-    void removeActivateListener( [in] ::com::sun::star::form::XFormControllerListener _Listener );
+    void removeActivateListener( [in] ::com::sun::star::form::XFormControllerListener Listener );
 
     /** adds a controller to the list of child controllers
         @throws ::com::sun::star::lang::IllegalArgumentException
@@ -351,7 +351,7 @@ interface XFormController
             mirror the hierarchy of the forms the are responsible for, this means that the form of the given
             child controller must be a child of the controller at which the method is invoked.
     */
-    void addChildController( [in] XFormController _ChildController )
+    void addChildController( [in] XFormController ChildController )
         raises ( ::com::sun::star::lang::IllegalArgumentException );
 };
 
diff --git a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
index 5cce866a4dfb..73e467b4e4ee 100644
--- a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
+++ b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
@@ -37,7 +37,7 @@ interface XFormControllerContext
 {
     /** ensures the given control is visible, by scrolling the view if necessary.
     */
-    void    makeVisible( [in] ::com::sun::star::awt::XControl _Control );
+    void    makeVisible( [in] ::com::sun::star::awt::XControl Control );
 };
 
 
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index a1dddb1a27d0..ffc46563b014 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -342,9 +342,9 @@ interface XPropertyHandler
         @param Primary
             `TRUE` if and only if the primary button has been clicked, `FALSE` otherwise
 
-        @param out_Data
+        @param outData
             If the method returns InteractiveSelectionResult::ObtainedValue,
-            then out_Data contains the value which has been interactively obtained
+            then outData contains the value which has been interactively obtained
             from the user, and which still needs to be set at the inspected component.
 
         @param InspectorUI
@@ -369,7 +369,7 @@ interface XPropertyHandler
         onInteractivePropertySelection(
             [in] string PropertyName,
             [in] boolean Primary,
-            [out] any out_Data,
+            [out] any outData,
             [in] XObjectInspectorUI InspectorUI
         )
         raises (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
diff --git a/offapi/com/sun/star/logging/XCsvLogFormatter.idl b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
index 83bd84b583ed..038f8c478ec1 100644
--- a/offapi/com/sun/star/logging/XCsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
@@ -55,9 +55,9 @@ interface XCsvLogFormatter : XLogFormatter
         column, any logged information has to be send through this
         method before calling log(). E.g.:
 
-        <code>XLoggerInstance.log(1000, XCsvLogFormatterInstance.formatMultiColumn(column_data))</code>
+        <code>XLoggerInstance.log(1000, XCsvLogFormatterInstance.formatMultiColumn(columnData))</code>
     */
-    string formatMultiColumn( [in] sequence< string > column_data);
+    string formatMultiColumn( [in] sequence< string > columnData);
 };
 
 
diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl
index e28bff96c5b7..c89dbaea4a94 100644
--- a/offapi/com/sun/star/scanner/XScannerManager.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager.idl
@@ -43,7 +43,7 @@ published interface XScannerManager: com::sun::star::uno::XInterface
         configure the scan area, etc., it
         returns FALSE if user cancelled this process
     */
-    boolean configureScanner( [inout] com::sun::star::scanner::ScannerContext scanner_context )
+    boolean configureScanner( [inout] com::sun::star::scanner::ScannerContext scannerContext )
             raises( com::sun::star::scanner::ScannerException );
 
     /**start the scanning process
@@ -52,18 +52,18 @@ published interface XScannerManager: com::sun::star::uno::XInterface
         the ScannerManager if the scan was successful,
         an empty interface otherwise
     */
-    void startScan( [in] com::sun::star::scanner::ScannerContext scanner_context,
+    void startScan( [in] com::sun::star::scanner::ScannerContext scannerContext,
              [in] com::sun::star::lang::XEventListener listener )
             raises( com::sun::star::scanner::ScannerException );
 
     /**get the state of scanning after completion of scan
     */
-    com::sun::star::scanner::ScanError getError( [in] com::sun::star::scanner::ScannerContext scanner_context )
+    com::sun::star::scanner::ScanError getError( [in] com::sun::star::scanner::ScannerContext scannerContext )
             raises( com::sun::star::scanner::ScannerException );
 
     /**get the image after completion of scan
     */
-    com::sun::star::awt::XBitmap getBitmap( [in] com::sun::star::scanner::ScannerContext scanner_context )
+    com::sun::star::awt::XBitmap getBitmap( [in] com::sun::star::scanner::ScannerContext scannerContext )
             raises( com::sun::star::scanner::ScannerException );
 
 };
diff --git a/offapi/com/sun/star/scanner/XScannerManager2.idl b/offapi/com/sun/star/scanner/XScannerManager2.idl
index b7d53e44f2b9..8272b461a1d4 100644
--- a/offapi/com/sun/star/scanner/XScannerManager2.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager2.idl
@@ -27,7 +27,7 @@ published interface XScannerManager2: com::sun::star::scanner::XScannerManager
         configure the scan area, etc., it, and scan it
         returns FALSE if user cancelled this process
     */
-    boolean configureScannerAndScan( [inout] com::sun::star::scanner::ScannerContext scanner_context,
+    boolean configureScannerAndScan( [inout] com::sun::star::scanner::ScannerContext scannerContext,
              [in] com::sun::star::lang::XEventListener listener )
             raises( com::sun::star::scanner::ScannerException );
 
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
index d597caef7172..632c4ce48284 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
@@ -38,11 +38,11 @@ interface XRowSetChangeBroadcaster
 {
     /** adds a listener to be notified when the <code>RowSet</code> supplied by the component changes.
     */
-    void addRowSetChangeListener( [in] XRowSetChangeListener i_Listener );
+    void addRowSetChangeListener( [in] XRowSetChangeListener iListener );
 
     /** removes a previously added listener.
     */
-    void removeRowSetChangeListener( [in] XRowSetChangeListener i_Listener );
+    void removeRowSetChangeListener( [in] XRowSetChangeListener iListener );
 };
 
 
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
index 24b076087070..8e178b962a01 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module sdb {
     /** notifies the listener that the <code>RowSet</code> associated with a XRowSetSupplier
         has changed.
     */
-    void onRowSetChanged( [in] ::com::sun::star::lang::EventObject i_Event );
+    void onRowSetChanged( [in] ::com::sun::star::lang::EventObject iEvent );
 };
 
 
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index d479321b4bc3..dc1cec631b2a 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -44,7 +44,7 @@ published interface XModeChangeApproveListener : com::sun::star::lang::XEventLis
         @throws VetoException
             when the mode change is vetoed
     */
-    void approveModeChange( [in] ModeChangeEvent _rSource )
+    void approveModeChange( [in] ModeChangeEvent rSource )
         raises ( VetoException );
 };
 
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index 6640a70751c3..3cb0cefefdb7 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -42,12 +42,12 @@ published interface XModeChangeBroadcaster : com::sun::star::uno::XInterface
     /** adds the given listener to the list of components to be notified when the mode
         changes.
     */
-    void addModeChangeListener( [in] XModeChangeListener _rxListener );
+    void addModeChangeListener( [in] XModeChangeListener rxListener );
 
     /** removes the given listener from the list of components to be notified when the mode
         changes.
     */
-    void removeModeChangeListener( [in] XModeChangeListener _rxListener );
+    void removeModeChangeListener( [in] XModeChangeListener rxListener );
 
     /** adds the given listener to the list of components to be notified when the mode
         is about to change.
@@ -55,7 +55,7 @@ published interface XModeChangeBroadcaster : com::sun::star::uno::XInterface
         @throws com::sun::star::lang::NoSupportException
             if the component does not allow vetoing mode changes
     */
-    void addModeChangeApproveListener( [in] XModeChangeApproveListener _rxListener )
+    void addModeChangeApproveListener( [in] XModeChangeApproveListener rxListener )
         raises( com::sun::star::lang::NoSupportException );
 
     /** remove the given listener from the list of components to be notified when the mode
@@ -64,7 +64,7 @@ published interface XModeChangeBroadcaster : com::sun::star::uno::XInterface
         @throws com::sun::star::lang::NoSupportException
             if the component does not allow vetoing mode changes
     */
-    void removeModeChangeApproveListener( [in] XModeChangeApproveListener _rxListener )
+    void removeModeChangeApproveListener( [in] XModeChangeApproveListener rxListener )
         raises( com::sun::star::lang::NoSupportException );
 };
 
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index f6b4a0e4fa2c..634a2198e01c 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -38,7 +38,7 @@ published interface XModeChangeListener : com::sun::star::lang::XEventListener
 {
     /** indicates that the mode of the broadcasting component has changed.
     */
-    void modeChanged( [in] ModeChangeEvent _rSource );
+    void modeChanged( [in] ModeChangeEvent rSource );
 };
 
 
diff --git a/offapi/org/freedesktop/PackageKit/XModify.idl b/offapi/org/freedesktop/PackageKit/XModify.idl
index b79542f87e5c..5313d8fd9da8 100644
--- a/offapi/org/freedesktop/PackageKit/XModify.idl
+++ b/offapi/org/freedesktop/PackageKit/XModify.idl
@@ -56,7 +56,7 @@ interface XModify : com::sun::star::uno::XInterface
      * @since LibreOffice 4.0
      */
 
-    void InstallMimeTypes( [in] unsigned long xid, [in] sequence< string > mime_types, [in] string interaction);
+    void InstallMimeTypes( [in] unsigned long xid, [in] sequence< string > mimeTypes, [in] string interaction);
 
     /**
      * Installs fontconfig resources ( [in] usually fonts) from a configured software source.
diff --git a/offapi/org/freedesktop/PackageKit/XQuery.idl b/offapi/org/freedesktop/PackageKit/XQuery.idl
index 5b3605abd2f6..0c8ea1c3bbfd 100644
--- a/offapi/org/freedesktop/PackageKit/XQuery.idl
+++ b/offapi/org/freedesktop/PackageKit/XQuery.idl
@@ -27,14 +27,14 @@ interface XQuery : com::sun::star::uno::XInterface
      * @since LibreOffice 4.0
      */
 
-    void IsInstalled([in] string package_name, [in] string interaction, [out] boolean installed);
+    void IsInstalled([in] string packageName, [in] string interaction, [out] boolean installed);
 
     /**
      * Installs packages to provide files.
      * @since LibreOffice 4.0
      */
 
-    void SearchFile([in] string file_name, [in] string interaction, [out] boolean installed, [out] string package_name);
+    void SearchFile([in] string fileName, [in] string interaction, [out] boolean installed, [out] string packageName);
 
 };