diff --git a/nav2_rviz_plugins/include/nav2_rviz_plugins/selector.hpp b/nav2_rviz_plugins/include/nav2_rviz_plugins/selector.hpp
index 42105e16683..c5339898337 100644
--- a/nav2_rviz_plugins/include/nav2_rviz_plugins/selector.hpp
+++ b/nav2_rviz_plugins/include/nav2_rviz_plugins/selector.hpp
@@ -54,7 +54,7 @@ class Selector : public rviz_common::Panel
   bool plugins_loaded_ = false;
 
   QBasicTimer timer_;
-  QVBoxLayout * main_layout;
+  QVBoxLayout * main_layout_;
   QComboBox * controller_;
   QComboBox * planner_;
 
diff --git a/nav2_rviz_plugins/src/selector.cpp b/nav2_rviz_plugins/src/selector.cpp
index 667a91c7180..6a1cea29ba7 100644
--- a/nav2_rviz_plugins/src/selector.cpp
+++ b/nav2_rviz_plugins/src/selector.cpp
@@ -30,18 +30,18 @@ Selector::Selector(QWidget * parent)
     client_node_->create_publisher<std_msgs::msg::String>("controller_selector", qos);
   pub_planner_ = client_node_->create_publisher<std_msgs::msg::String>("planner_selector", qos);
 
-  main_layout = new QVBoxLayout;
+  main_layout_ = new QVBoxLayout;
   controller_ = new QComboBox;
   planner_ = new QComboBox;
 
-  main_layout->setContentsMargins(10, 10, 10, 10);
+  main_layout_->setContentsMargins(10, 10, 10, 10);
 
-  main_layout->addWidget(new QLabel("Controller"));
-  main_layout->addWidget(controller_);
-  main_layout->addWidget(new QLabel("Planner"));
-  main_layout->addWidget(planner_);
+  main_layout_->addWidget(new QLabel("Controller"));
+  main_layout_->addWidget(controller_);
+  main_layout_->addWidget(new QLabel("Planner"));
+  main_layout_->addWidget(planner_);
 
-  setLayout(main_layout);
+  setLayout(main_layout_);
   timer_.start(200, this);
 
   connect(