diff --git a/pcbnew/netinfo_item.cpp b/pcbnew/netinfo_item.cpp
index 545f97aa9b..51f3fd9688 100644
--- a/pcbnew/netinfo_item.cpp
+++ b/pcbnew/netinfo_item.cpp
@@ -42,9 +42,9 @@
 NETINFO_ITEM::NETINFO_ITEM( BOARD* aParent, const wxString& aNetName, int aNetCode ) :
         BOARD_ITEM( aParent, PCB_NETINFO_T ),
         m_netCode( aNetCode ),
-        m_isCurrent( true ),
         m_netname( aNetName ),
-        m_shortNetname( m_netname.AfterLast( '/' ) )
+        m_shortNetname( m_netname.AfterLast( '/' ) ),
+        m_isCurrent( true )
 {
     m_parent = aParent;
 
diff --git a/pcbnew/plugins/kicad/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp
index acc9be1f8d..a693817e02 100644
--- a/pcbnew/plugins/kicad/pcb_parser.cpp
+++ b/pcbnew/plugins/kicad/pcb_parser.cpp
@@ -685,14 +685,14 @@ BOARD* PCB_PARSER::parseBOARD_unchecked()
         default:          THROW_IO_ERROR( wxT( "CANCEL" ) );
         }
 
-        auto visitItem = [&]( BOARD_ITEM* item )
+        auto visitItem = [&]( BOARD_ITEM* curr_item )
                             {
-                                if( item->GetLayer() == Rescue )
+                                if( curr_item->GetLayer() == Rescue )
                                 {
                                     if( deleteItems )
-                                        deleteList.push_back( item );
+                                        deleteList.push_back( curr_item );
                                     else
-                                        item->SetLayer( Cmts_User );
+                                        curr_item->SetLayer( Cmts_User );
                                 }
                             };
 
@@ -734,8 +734,8 @@ BOARD* PCB_PARSER::parseBOARD_unchecked()
         for( BOARD_ITEM* drawing : m_board->Drawings() )
             visitItem( drawing );
 
-        for( BOARD_ITEM* item : deleteList )
-            m_board->Delete( item );
+        for( BOARD_ITEM* curr_item : deleteList )
+            m_board->Delete( curr_item );
 
         m_undefinedLayers.clear();
     }