diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H
index e7103a688..7b5620160 100644
--- a/FL/Fl_Browser_.H
+++ b/FL/Fl_Browser_.H
@@ -283,7 +283,7 @@ public:
   /**
     Sets the default text size (in pixels) for the lines in the browser to \p size.
   */
-  void textsize(Fl_Fontsize size) { textsize_ = size; }
+  void textsize(Fl_Fontsize newSize) { textsize_ = newSize; }
 
   /**
     Gets the default text color for the lines in the browser.
@@ -325,8 +325,8 @@ public:
                     If 0 (default), scrollbar size tracks the global Fl::scrollbar_size()
     \see Fl::scrollbar_size()
   */
-  void scrollbar_size(int size) {
-      scrollbar_size_ = size;
+  void scrollbar_size(int newSize) {
+      scrollbar_size_ = newSize;
   }   
   /**
     This method has been deprecated, existing for backwards compatibility only.
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 9ea58556d..5b6970fab 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -364,7 +364,7 @@ public:
   static const char *class_id;
   virtual const char *class_name() {return class_id;};
   /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */
-  virtual void font(Fl_Font face, Fl_Fontsize size) {font_ = face; size_ = size;}
+  virtual void font(Fl_Font face, Fl_Fontsize fsize) {font_ = face; size_ = fsize;}
   /** \brief see fl_font(void). */
   Fl_Font font() {return font_; }
   /** \brief see fl_size(). */
@@ -529,8 +529,8 @@ public:
 class FL_EXPORT Fl_Device_Plugin : public Fl_Plugin {
 public:
   /** \brief The constructor */
-  Fl_Device_Plugin(const char *name)
-  : Fl_Plugin(klass(), name) { }
+  Fl_Device_Plugin(const char *pluginName)
+  : Fl_Plugin(klass(), pluginName) { }
   /** \brief Returns the class name */
   virtual const char *klass() { return "fltk:device"; }
   /** \brief Returns the plugin name */
diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H
index 4ad4f5324..52cd04728 100644
--- a/FL/Fl_Help_View.H
+++ b/FL/Fl_Help_View.H
@@ -375,8 +375,8 @@ public:
                     If 0 (default), scrollbar size tracks the global Fl::scrollbar_size()
     \see Fl::scrollbar_size()
   */
-  void scrollbar_size(int size) {
-      scrollbar_size_ = size;
+  void scrollbar_size(int newSize) {
+      scrollbar_size_ = newSize;
   }   
 };
 
diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H
index 50cb7a9ab..e537342ad 100644
--- a/FL/Fl_Input_.H
+++ b/FL/Fl_Input_.H
@@ -202,7 +202,7 @@ protected:
 
   /** \internal Vertical offset of text to top edge of widget. */
   int yscroll() const {return yscroll_;}
-  void yscroll(int y) { yscroll_ = y; damage(FL_DAMAGE_EXPOSE);}
+  void yscroll(int yOffset) { yscroll_ = yOffset; damage(FL_DAMAGE_EXPOSE);}
 
   /* Return the number of lines displayed on a single page.  */
   int linesPerPage();
diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H
index 8c503fbbb..a6381c79c 100644
--- a/FL/Fl_Input_Choice.H
+++ b/FL/Fl_Input_Choice.H
@@ -56,8 +56,8 @@ class FL_EXPORT Fl_Input_Choice : public Fl_Group {
       if (Fl::focus() == this) draw_focus();
     }
   public:
-    InputMenuButton(int x,int y,int w,int h,const char*l=0) : 
-	Fl_Menu_Button(x,y,w,h,l) { box(FL_UP_BOX); }
+    InputMenuButton(int X,int Y,int W,int H,const char*L=0) : 
+	Fl_Menu_Button(X, Y, W, H, L) { box(FL_UP_BOX); }
   };
 
   Fl_Input *inp_;
@@ -128,7 +128,7 @@ public:
     and label string.
   <P> Inherited destructor Destroys the widget and any value associated with it.
   */
-  Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) : Fl_Group(x,y,w,h,l) {
+  Fl_Input_Choice (int X,int Y,int W,int H,const char*L=0) : Fl_Group(X,Y,W,H,L) {
     Fl_Group::box(FL_DOWN_BOX);
     align(FL_ALIGN_LEFT);				// default like Fl_Input
     inp_ = new Fl_Input(inp_x(), inp_y(),
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H
index 827a7fbf2..e7613f2e3 100644
--- a/FL/Fl_PostScript.H
+++ b/FL/Fl_PostScript.H
@@ -184,9 +184,9 @@ class Clip {
   void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3);
   void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
       
-  void draw(const char* s, int n, int x, int y) {transformed_draw(s,n,x,y); };
+  void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
 #ifdef __APPLE__
-  void draw(const char* s, int n, float x, float y) {transformed_draw(s,n,x,y); };
+  void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
 #endif
   void draw(int angle, const char *str, int n, int x, int y);
   void rtl_draw(const char* s, int n, int x, int y);
diff --git a/FL/Fl_Radio_Button.H b/FL/Fl_Radio_Button.H
index 4c500ef5b..7238877a8 100644
--- a/FL/Fl_Radio_Button.H
+++ b/FL/Fl_Radio_Button.H
@@ -26,8 +26,8 @@
 
 class FL_EXPORT Fl_Radio_Button : public Fl_Button {
 public:
-    Fl_Radio_Button(int x,int y,int w,int h,const char *l=0)
-	: Fl_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);}
+    Fl_Radio_Button(int X,int Y,int W,int H,const char *L=0)
+	: Fl_Button(X, Y, W, H, L) {type(FL_RADIO_BUTTON);}
 };
 
 #endif
diff --git a/FL/Fl_Round_Clock.H b/FL/Fl_Round_Clock.H
index 07513dc27..ceb86d48d 100644
--- a/FL/Fl_Round_Clock.H
+++ b/FL/Fl_Round_Clock.H
@@ -28,8 +28,8 @@
 class FL_EXPORT Fl_Round_Clock : public Fl_Clock {
 public:
     /** Creates the clock widget, setting his type and box. */
-    Fl_Round_Clock(int x,int y,int w,int h, const char *l = 0)
-	: Fl_Clock(x,y,w,h,l) {type(FL_ROUND_CLOCK); box(FL_NO_BOX);}
+    Fl_Round_Clock(int X,int Y,int W,int H, const char *L = 0)
+	: Fl_Clock(X, Y, W, H, L) {type(FL_ROUND_CLOCK); box(FL_NO_BOX);}
 };
 
 #endif
diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H
index 00c1fb6cd..5b6380bfc 100644
--- a/FL/Fl_Scroll.H
+++ b/FL/Fl_Scroll.H
@@ -177,9 +177,9 @@ public:
                     If 0 (default), scrollbar size tracks the global Fl::scrollbar_size()
     \see Fl::scrollbar_size()
   */
-  void scrollbar_size(int size) {
-      if ( size != scrollbar_size_ ) redraw();
-      scrollbar_size_ = size;
+  void scrollbar_size(int newSize) {
+      if ( newSize != scrollbar_size_ ) redraw();
+      scrollbar_size_ = newSize;
   }   
 };
 
diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H
index 8138bc9c3..c2b9abe08 100644
--- a/FL/Fl_Scrollbar.H
+++ b/FL/Fl_Scrollbar.H
@@ -75,7 +75,7 @@ public:
   /**
     Sets the position, size and range of the slider in the scrollbar.
     \param[in] pos   position, first line displayed
-    \param[in] size  window size, number of lines displayed
+    \param[in] windowSize  number of lines displayed
     \param[in] first number of first line
     \param[in] total total number of lines
 
@@ -86,8 +86,8 @@ public:
 
     Calls Fl_Slider::scrollvalue(int pos, int size, int first, int total).
   */
-  int value(int pos, int size, int first, int total) {
-    return scrollvalue(pos, size, first, total);
+  int value(int pos, int windowSize, int first, int total) {
+    return scrollvalue(pos, windowSize, first, total);
   }
 
   /**
diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H
index 73a772637..fed50fb72 100644
--- a/FL/Fl_Table.H
+++ b/FL/Fl_Table.H
@@ -449,19 +449,19 @@ protected:
   
   void damage_zone(int r1, int c1, int r2, int c2, int r3 = 0, int c3 = 0);
   
-  void redraw_range(int toprow, int botrow, int leftcol, int rightcol) {
+  void redraw_range(int topRow, int botRow, int leftCol, int rightCol) {
     if ( _redraw_toprow == -1 ) {
       // Initialize redraw range
-      _redraw_toprow = toprow;
-      _redraw_botrow = botrow;
-      _redraw_leftcol = leftcol;
-      _redraw_rightcol = rightcol;
+      _redraw_toprow = topRow;
+      _redraw_botrow = botRow;
+      _redraw_leftcol = leftCol;
+      _redraw_rightcol = rightCol;
     } else {
       // Extend redraw range
-      if ( toprow < _redraw_toprow ) _redraw_toprow = toprow;
-      if ( botrow > _redraw_botrow ) _redraw_botrow = botrow;
-      if ( leftcol < _redraw_leftcol ) _redraw_leftcol = leftcol;
-      if ( rightcol > _redraw_rightcol ) _redraw_rightcol = rightcol;
+      if ( topRow < _redraw_toprow ) _redraw_toprow = topRow;
+      if ( botRow > _redraw_botrow ) _redraw_botrow = botRow;
+      if ( leftCol < _redraw_leftcol ) _redraw_leftcol = leftCol;
+      if ( rightCol > _redraw_rightcol ) _redraw_rightcol = rightCol;
     }
     
     // Indicate partial redraw needed of some cells
@@ -852,25 +852,25 @@ public:
     table->init_sizes();
     table->redraw();
   }
-  void add(Fl_Widget& w) {
-    table->add(w);
+  void add(Fl_Widget& wgt) {
+    table->add(wgt);
     if ( table->children() > 2 ) {
       table->show();
     } else {
       table->hide();
     } 
   }
-  void add(Fl_Widget* w) {
-    add(*w);
+  void add(Fl_Widget* wgt) {
+    add(*wgt);
   }
-  void insert(Fl_Widget& w, int n) {
-    table->insert(w,n);
+  void insert(Fl_Widget& wgt, int n) {
+    table->insert(wgt,n);
   }
-  void insert(Fl_Widget& w, Fl_Widget* w2) {
-    table->insert(w,w2);
+  void insert(Fl_Widget& wgt, Fl_Widget* w2) {
+    table->insert(wgt,w2);
   }
-  void remove(Fl_Widget& w) {
-    table->remove(w);
+  void remove(Fl_Widget& wgt) {
+    table->remove(wgt);
   }
   void begin() {
     table->begin();
@@ -920,11 +920,11 @@ public:
   int children() const {
     return(table->children()-2);    // -2: skip Fl_Scroll's h/v scrollbar widgets
   }
-  int find(const Fl_Widget *w) const {
-    return(table->find(w));
+  int find(const Fl_Widget *wgt) const {
+    return(table->find(wgt));
   }
-  int find(const Fl_Widget &w) const {
-    return(table->find(w));
+  int find(const Fl_Widget &wgt) const {
+    return(table->find(wgt));
   } 
   // CALLBACKS
   
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 184420b9d..e765c3a9d 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -857,7 +857,7 @@ public:
       \param[in] w the possible parent widget.
       \see contains()
    */
-  int inside(const Fl_Widget* w) const {return w ? w->contains(this) : 0;}
+  int inside(const Fl_Widget* wgt) const {return wgt ? wgt->contains(this) : 0;}
 
   /** Schedules the drawing of the widget.
       Marks the widget as needing its draw() routine called.
diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index 712d50d8b..62b7f58dc 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -488,7 +488,7 @@ inline void fl_transformed_vertex(double xf, double yf) {fl_graphics_driver->tra
   The size of the font is measured in pixels and not "points".
   Lines should be spaced \p size pixels apart or more.
 */
-inline void fl_font(Fl_Font face, Fl_Fontsize size) { fl_graphics_driver->font(face,size); }
+inline void fl_font(Fl_Font face, Fl_Fontsize fsize) { fl_graphics_driver->font(face,fsize); }
 
 /**
   Returns the \p face set by the most recent call to fl_font().
diff --git a/FL/x.H b/FL/x.H
index 409c56899..148e01a04 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -165,7 +165,7 @@ public:
 extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
 extern FL_EXPORT int fl_background_pixel;  // hack into Fl_X::make_xid()
 
-inline Window fl_xid(const Fl_Window* w) { Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0; }
+inline Window fl_xid(const Fl_Window* w) { Fl_X *xTemp = Fl_X::i(w); return xTemp ? xTemp->xid : 0; }
 
 #else