diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt
index ffc693ce4..698358fb6 100644
--- a/src/meshlab/CMakeLists.txt
+++ b/src/meshlab/CMakeLists.txt
@@ -23,9 +23,9 @@ set(SOURCES
 	plugindialog.cpp
 	saveSnapshotDialog.cpp
 	savemaskexporter.cpp
-	meshlab_settings/richparameterlistdialog.cpp
-	meshlab_settings/richparameterlistframe.cpp
-	meshlab_settings/richparameterwidgets.cpp
+	rich_parameter_gui/richparameterlistdialog.cpp
+	rich_parameter_gui/richparameterlistframe.cpp
+	rich_parameter_gui/richparameterwidgets.cpp
 	meshlab_settings/settingdialog.cpp
 	meshlab_settings/meshlabsettingsdialog.cpp
 	${VCGDIR}/wrap/gui/trackball.cpp
@@ -50,9 +50,9 @@ set(HEADERS
 	saveSnapshotDialog.h
 	savemaskexporter.h
 	snapshotsetting.h
-	meshlab_settings/richparameterlistdialog.h
-	meshlab_settings/richparameterlistframe.h
-	meshlab_settings/richparameterwidgets.h
+	rich_parameter_gui/richparameterlistdialog.h
+	rich_parameter_gui/richparameterlistframe.h
+	rich_parameter_gui/richparameterwidgets.h
 	meshlab_settings/settingdialog.h
 	meshlab_settings/meshlabsettingsdialog.h
 	${VCGDIR}/wrap/gui/trackball.h
diff --git a/src/meshlab/filterScriptDialog.cpp b/src/meshlab/filterScriptDialog.cpp
index 5da8ca65e..4214013bc 100644
--- a/src/meshlab/filterScriptDialog.cpp
+++ b/src/meshlab/filterScriptDialog.cpp
@@ -27,7 +27,7 @@
 #include "filterScriptDialog.h"
 #include "mainwindow.h"
 #include "../common/mlexception.h"
-#include "meshlab_settings/richparameterlistdialog.h"
+#include "rich_parameter_gui/richparameterlistdialog.h"
 
 FilterScriptDialog::FilterScriptDialog(QWidget * parent)
 		:QDialog(parent)
@@ -234,7 +234,7 @@ void FilterScriptDialog::editOldParameters( const int row )
 	}
 
 	//launch the dialog
-	RichParameterListDialog parameterDialog(this, &newParameterSet, "Edit Parameters", mainWindow->meshDoc());
+	RichParameterListDialog parameterDialog(this, newParameterSet, "Edit Parameters", mainWindow->meshDoc());
 	int result = parameterDialog.exec();
 	if(result == QDialog::Accepted) {
 		//keep the changes
diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp
index be3b042c0..b08728826 100644
--- a/src/meshlab/mainwindow_RunTime.cpp
+++ b/src/meshlab/mainwindow_RunTime.cpp
@@ -46,7 +46,7 @@
 #include "../common/filterscript.h"
 #include "../common/mlexception.h"
 
-#include "meshlab_settings/richparameterlistdialog.h"
+#include "rich_parameter_gui/richparameterlistdialog.h"
 
 #include <wrap/io_trimesh/alnParser.h>
 
@@ -2300,7 +2300,7 @@ bool MainWindow::importMesh(QString fileName,bool isareload)
         pCurrentIOPlugin->initPreOpenParameter(extension, fileName,prePar);
         if(!prePar.isEmpty())
         {
-            RichParameterListDialog preOpenDialog(this, &prePar, tr("Pre-Open Options"));
+			RichParameterListDialog preOpenDialog(this, prePar, tr("Pre-Open Options"));
             preOpenDialog.setFocus();
             preOpenDialog.exec();
         }
@@ -2322,7 +2322,7 @@ bool MainWindow::importMesh(QString fileName,bool isareload)
             pCurrentIOPlugin->initOpenParameter(extension, *mm, par);
             if(!par.isEmpty())
             {
-                RichParameterListDialog postOpenDialog(this, &par, tr("Post-Open Processing"));
+				RichParameterListDialog postOpenDialog(this, par, tr("Post-Open Processing"));
                 postOpenDialog.setFocus();
                 postOpenDialog.exec();
                 pCurrentIOPlugin->applyOpenParameter(extension, *mm, par);
diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
index b44ba6e9a..4e492a184 100644
--- a/src/meshlab/meshlab.pro
+++ b/src/meshlab/meshlab.pro
@@ -50,9 +50,9 @@ HEADERS += \
 	$$VCGDIR/wrap/gui/trackball.h \
 	$$VCGDIR/wrap/gui/trackmode.h \
 	$$VCGDIR/wrap/gl/trimesh.h \
-	meshlab_settings/richparameterlistdialog.h \
-	meshlab_settings/richparameterlistframe.h \
-	meshlab_settings/richparameterwidgets.h
+	rich_parameter_gui/richparameterlistdialog.h \
+	rich_parameter_gui/richparameterlistframe.h \
+	rich_parameter_gui/richparameterwidgets.h
 
 SOURCES += \
 	main.cpp \
@@ -77,9 +77,9 @@ SOURCES += \
 	$$VCGDIR/wrap/gui/trackmode.cpp \
 	$$VCGDIR/wrap/gui/coordinateframe.cpp \
 	glarea_setting.cpp \
-	meshlab_settings/richparameterlistdialog.cpp \
-	meshlab_settings/richparameterlistframe.cpp \
-	meshlab_settings/richparameterwidgets.cpp
+	rich_parameter_gui/richparameterlistdialog.cpp \
+	rich_parameter_gui/richparameterlistframe.cpp \
+	rich_parameter_gui/richparameterwidgets.cpp
 
 FORMS += \
 	ui/layerDialog.ui \
diff --git a/src/meshlab/meshlab_settings/settingdialog.cpp b/src/meshlab/meshlab_settings/settingdialog.cpp
index 29dae9efe..3aa6a024b 100644
--- a/src/meshlab/meshlab_settings/settingdialog.cpp
+++ b/src/meshlab/meshlab_settings/settingdialog.cpp
@@ -31,11 +31,9 @@ SettingDialog::SettingDialog(
 	frame(this),
 	curPar(currentPar.clone()),
 	tmpPar(currentPar.clone()),
-	defPar(defaultPar.clone())
+	defPar(defaultPar)
 {
-	tmpParSet = RichParameterList();
-	tmpParSet.addParam(*curPar);
-	frame.loadFrameContent(tmpParSet);
+	frame.loadFrameContent(*curPar, defPar);
 
 	setModal(true);
 
@@ -70,7 +68,6 @@ SettingDialog::~SettingDialog()
 {
 	delete curPar;
 	delete tmpPar;
-	delete defPar;
 }
 
 void SettingDialog::save()
@@ -98,7 +95,7 @@ void SettingDialog::reset()
 	qDebug("resetting the value of param %s to the hardwired default", qUtf8Printable(curPar->name()));
 
 	assert(frame.stdfieldwidgets.size() == 1);
-	frame.stdfieldwidgets.at(0)->setValue(defPar->value());
+	frame.stdfieldwidgets.at(0)->setValue(defPar.value());
 	apply();
 }
 
diff --git a/src/meshlab/meshlab_settings/settingdialog.h b/src/meshlab/meshlab_settings/settingdialog.h
index 24c8ce2ef..9bea6cbb0 100644
--- a/src/meshlab/meshlab_settings/settingdialog.h
+++ b/src/meshlab/meshlab_settings/settingdialog.h
@@ -26,7 +26,7 @@
 
 #include <QDialog>
 #include <common/filter_parameter/rich_parameter.h>
-#include "richparameterlistframe.h"
+#include "../rich_parameter_gui/richparameterlistframe.h"
 
 class SettingDialog : public QDialog
 {
@@ -44,11 +44,10 @@ signals:
 	void applySettingSignal(const RichParameter&);
 
 private:
-	RichParameterList tmpParSet;
 	RichParameterListFrame frame;
 	RichParameter* curPar;
 	RichParameter* tmpPar;
-	const RichParameter* defPar;
+	const RichParameter& defPar;
 	QPushButton* savebut;
 	QPushButton* applybut;
 	QPushButton* resetbut;
diff --git a/src/meshlab/ml_std_par_dialog.cpp b/src/meshlab/ml_std_par_dialog.cpp
index c59c73ab8..89d96ded3 100644
--- a/src/meshlab/ml_std_par_dialog.cpp
+++ b/src/meshlab/ml_std_par_dialog.cpp
@@ -110,7 +110,7 @@ void MeshlabStdDialog::resetValues()
 	assert(qf);
 	assert(qf->isVisible());
 	// assert(curParSet.paramList.count() == stdfieldwidgets.count());
-	stdParFrame->resetValues(curParSet);
+	stdParFrame->resetValues();
 }
 
 void MeshlabStdDialog::loadFrameContent(MeshDocument *mdPt)
diff --git a/src/meshlab/ml_std_par_dialog.h b/src/meshlab/ml_std_par_dialog.h
index 347471cea..b36e9cd0e 100644
--- a/src/meshlab/ml_std_par_dialog.h
+++ b/src/meshlab/ml_std_par_dialog.h
@@ -25,7 +25,7 @@
 #define ML_STD_PAR_DIALOG
 
 #include<QDockWidget>
-#include "meshlab_settings/richparameterlistframe.h"
+#include "rich_parameter_gui/richparameterlistframe.h"
 
 class MainWindow;
 class MeshlabStdDialog : public QDockWidget
diff --git a/src/meshlab/meshlab_settings/richparameterlistdialog.cpp b/src/meshlab/rich_parameter_gui/richparameterlistdialog.cpp
similarity index 93%
rename from src/meshlab/meshlab_settings/richparameterlistdialog.cpp
rename to src/meshlab/rich_parameter_gui/richparameterlistdialog.cpp
index 95bb5df20..5656591d7 100644
--- a/src/meshlab/meshlab_settings/richparameterlistdialog.cpp
+++ b/src/meshlab/rich_parameter_gui/richparameterlistdialog.cpp
@@ -25,10 +25,9 @@
 
 #include <QDialogButtonBox>
 
-RichParameterListDialog::RichParameterListDialog(QWidget *p, RichParameterList *_curParSet, QString title, MeshDocument *_meshDocument)
-	: QDialog(p) {
+RichParameterListDialog::RichParameterListDialog(QWidget *p, RichParameterList& curParSet, QString title, MeshDocument *_meshDocument)
+	: QDialog(p), curParSet(curParSet){
 		stdParFrame=NULL;
-		curParSet=_curParSet;
 		meshDocument = _meshDocument;
 		createFrame();
 		if(!title.isEmpty())
@@ -39,7 +38,7 @@ RichParameterListDialog::RichParameterListDialog(QWidget *p, RichParameterList *
 // update the values of the widgets with the values in the paramlist;
 void RichParameterListDialog::resetValues()
 {
-	stdParFrame->resetValues(*curParSet);
+	stdParFrame->resetValues();
 }
 
 void RichParameterListDialog::toggleHelp()
@@ -56,7 +55,7 @@ void RichParameterListDialog::createFrame()
 	setLayout(vboxLayout);
 
 	stdParFrame = new RichParameterListFrame(this);
-	stdParFrame->loadFrameContent(*curParSet, meshDocument);
+	stdParFrame->loadFrameContent(curParSet, meshDocument);
 	layout()->addWidget(stdParFrame);
 
 	QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Ok  | QDialogButtonBox::Cancel);
@@ -80,7 +79,7 @@ void RichParameterListDialog::createFrame()
 
 void RichParameterListDialog::getAccept()
 {
-	stdParFrame->readValues(*curParSet);
+	stdParFrame->readValues(curParSet);
 	accept();
 }
 
diff --git a/src/meshlab/meshlab_settings/richparameterlistdialog.h b/src/meshlab/rich_parameter_gui/richparameterlistdialog.h
similarity index 93%
rename from src/meshlab/meshlab_settings/richparameterlistdialog.h
rename to src/meshlab/rich_parameter_gui/richparameterlistdialog.h
index 9fc14d182..d1b7823fd 100644
--- a/src/meshlab/meshlab_settings/richparameterlistdialog.h
+++ b/src/meshlab/rich_parameter_gui/richparameterlistdialog.h
@@ -35,12 +35,9 @@ class RichParameterListDialog: public QDialog
 {
 	Q_OBJECT
 public:
-	RichParameterListDialog(QWidget *p, RichParameterList *_curParSet, QString title=QString(), MeshDocument *_meshDocument = 0);
+	RichParameterListDialog(QWidget *p, RichParameterList& curParSet, QString title=QString(), MeshDocument *_meshDocument = 0);
 	~RichParameterListDialog();
 
-	RichParameterList *curParSet;
-	RichParameterListFrame *stdParFrame;
-
 	void createFrame();
 
 	public slots:
@@ -51,6 +48,8 @@ public:
 	void resetValues();
 
 private:
+	RichParameterList& curParSet;
+	RichParameterListFrame *stdParFrame;
 	MeshDocument *meshDocument;
 
 };
diff --git a/src/meshlab/meshlab_settings/richparameterlistframe.cpp b/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp
similarity index 90%
rename from src/meshlab/meshlab_settings/richparameterlistframe.cpp
rename to src/meshlab/rich_parameter_gui/richparameterlistframe.cpp
index f761f7a7a..75bad3e27 100644
--- a/src/meshlab/meshlab_settings/richparameterlistframe.cpp
+++ b/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp
@@ -36,10 +36,9 @@
 
 using namespace vcg;
 
-RichParameterListFrame::RichParameterListFrame(QWidget *p, QWidget *curr_gla )
-    :QFrame(p)
+RichParameterListFrame::RichParameterListFrame(QWidget *p, QWidget *curr_gla ):
+	QFrame(p), gla(curr_gla)
 {
-	gla=curr_gla;
 }
 
 void RichParameterListFrame::loadFrameContent(
@@ -65,18 +64,29 @@ void RichParameterListFrame::loadFrameContent(
 	this->adjustSize();
 }
 
-
-
 /* creates widgets for the standard parameters */
 void RichParameterListFrame::loadFrameContent(const RichParameterList &curParSet, MeshDocument * /*_mdPt*/ )
 {
 	loadFrameContent(curParSet, curParSet);
 }
 
-//void StdParFrame::readValues(ParameterDeclarationSet &curParSet)
+void RichParameterListFrame::loadFrameContent(const RichParameter& curPar, const RichParameter& defPar)
+{
+	RichParameterList crpl;
+	crpl.addParam(curPar);
+	RichParameterList drpl;
+	drpl.addParam(defPar);
+	loadFrameContent(crpl, drpl);
+}
+
+/**
+ * @brief RichParameterListFrame::readValues
+ * From GUI to RichParameterList
+ * @param curParSet
+ */
 void RichParameterListFrame::readValues(RichParameterList &curParSet)
 {
-	assert(curParSet.size() == stdfieldwidgets.size());
+	assert(curParSet.size() == (unsigned int)stdfieldwidgets.size());
 	QVector<RichParameterWidget*>::iterator it = stdfieldwidgets.begin();
 	for(const RichParameter& p : curParSet) {
 		curParSet.setValue(p.name(),(*it)->widgetValue());
@@ -84,10 +94,9 @@ void RichParameterListFrame::readValues(RichParameterList &curParSet)
 	}
 }
 
-void RichParameterListFrame::resetValues(RichParameterList &curParSet)
+void RichParameterListFrame::resetValues()
 {
-	assert((unsigned int)stdfieldwidgets.size() == curParSet.size());
-	for(unsigned int i  =0; i < curParSet.size(); ++i) {
+	for(unsigned int i  =0; i < (unsigned int)stdfieldwidgets.size(); ++i) {
 		stdfieldwidgets[i]->resetValue();
 	}
 }
@@ -102,7 +111,6 @@ void RichParameterListFrame::toggleHelp()
 
 RichParameterListFrame::~RichParameterListFrame()
 {
-
 }
 
 RichParameterWidget* RichParameterListFrame::createWidgetFromRichParameter(
diff --git a/src/meshlab/meshlab_settings/richparameterlistframe.h b/src/meshlab/rich_parameter_gui/richparameterlistframe.h
similarity index 97%
rename from src/meshlab/meshlab_settings/richparameterlistframe.h
rename to src/meshlab/rich_parameter_gui/richparameterlistframe.h
index d51132e31..9a2b25bf9 100644
--- a/src/meshlab/meshlab_settings/richparameterlistframe.h
+++ b/src/meshlab/rich_parameter_gui/richparameterlistframe.h
@@ -53,10 +53,12 @@ public:
 	void loadFrameContent(const RichParameterList& curParSet, const RichParameterList& defParSet, MeshDocument *mdPt = 0);
 	void loadFrameContent(const RichParameterList& curParSet, MeshDocument *mdPt = 0);
 
+	void loadFrameContent(const RichParameter& curPar, const RichParameter& defPar);
+
     // The curParSet that is passed must be 'compatible' with the RichParameterSet that have been used to create the frame.
     // This function updates the RichParameterSet used to create the frame AND fill also the passed <curParSet>
     void readValues(RichParameterList &curParSet);
-    void resetValues(RichParameterList &curParSet);
+	void resetValues();
 
     void toggleHelp();
 
diff --git a/src/meshlab/meshlab_settings/richparameterwidgets.cpp b/src/meshlab/rich_parameter_gui/richparameterwidgets.cpp
similarity index 100%
rename from src/meshlab/meshlab_settings/richparameterwidgets.cpp
rename to src/meshlab/rich_parameter_gui/richparameterwidgets.cpp
diff --git a/src/meshlab/meshlab_settings/richparameterwidgets.h b/src/meshlab/rich_parameter_gui/richparameterwidgets.h
similarity index 100%
rename from src/meshlab/meshlab_settings/richparameterwidgets.h
rename to src/meshlab/rich_parameter_gui/richparameterwidgets.h
diff --git a/src/meshlab/savemaskexporter.h b/src/meshlab/savemaskexporter.h
index 4cba40197..b8b1e358e 100644
--- a/src/meshlab/savemaskexporter.h
+++ b/src/meshlab/savemaskexporter.h
@@ -26,7 +26,7 @@
 
 #include <wrap/io_trimesh/io_mask.h>
 
-#include "meshlab_settings/richparameterlistframe.h"
+#include "rich_parameter_gui/richparameterlistframe.h"
 #include <common/filter_parameter/rich_parameter_list.h>
 #include "glarea.h"
 //
diff --git a/src/meshlabplugins/edit_align/CMakeLists.txt b/src/meshlabplugins/edit_align/CMakeLists.txt
index 779427d6c..078a6ad8f 100644
--- a/src/meshlabplugins/edit_align/CMakeLists.txt
+++ b/src/meshlabplugins/edit_align/CMakeLists.txt
@@ -18,9 +18,9 @@ if(TARGET external-newuoa)
 		edit_align_factory.cpp
 		edit_align.cpp
 		meshtree.cpp
-		../../meshlab/meshlab_settings/richparameterwidgets.cpp
-		../../meshlab/meshlab_settings/richparameterlistframe.cpp
-		../../meshlab/meshlab_settings/richparameterlistdialog.cpp
+		../../meshlab/rich_parameter_gui/richparameterwidgets.cpp
+		../../meshlab/rich_parameter_gui/richparameterlistframe.cpp
+		../../meshlab/rich_parameter_gui/richparameterlistdialog.cpp
 		${VCGDIR}/wrap/gui/trackball.cpp
 		${VCGDIR}/wrap/gui/trackmode.cpp
 		${VCGDIR}/wrap/ply/plylib.cpp)
@@ -35,9 +35,9 @@ if(TARGET external-newuoa)
 		edit_align_factory.h
 		edit_align.h
 		meshtree.h
-		../../meshlab/meshlab_settings/richparameterwidgets.h
-		../../meshlab/meshlab_settings/richparameterlistframe.h
-		../../meshlab/meshlab_settings/richparameterlistdialog.h
+		../../meshlab/rich_parameter_gui/richparameterwidgets.h
+		../../meshlab/rich_parameter_gui/richparameterlistframe.h
+		../../meshlab/rich_parameter_gui/richparameterlistdialog.h
 		${VCGDIR}/wrap/gui/trackball.h
 		${VCGDIR}/wrap/gui/trackmode.h
 		${VCGDIR}/wrap/gl/trimesh.h)
diff --git a/src/meshlabplugins/edit_align/edit_align.cpp b/src/meshlabplugins/edit_align/edit_align.cpp
index 4150ec374..31c6fe10a 100644
--- a/src/meshlabplugins/edit_align/edit_align.cpp
+++ b/src/meshlabplugins/edit_align/edit_align.cpp
@@ -28,8 +28,8 @@ $Log: meshedit.cpp,v $
 #include "edit_align.h"
 #include <common/GLExtensionsManager.h>
 #include <meshlab/glarea.h>
-#include <meshlab/meshlab_settings/richparameterlistframe.h>
-#include <meshlab/meshlab_settings/richparameterlistdialog.h>
+#include <meshlab/rich_parameter_gui/richparameterlistframe.h>
+#include <meshlab/rich_parameter_gui/richparameterlistdialog.h>
 #include <wrap/qt/trackball.h>
 #include "AlignPairWidget.h"
 #include "AlignPairDialog.h"
@@ -360,7 +360,7 @@ void EditAlignPlugin:: alignParamCurrent()
     QString titleString=QString("Current Arc (%1 -> %2) Alignment Parameters").arg(currentArc()->MovName).arg(currentArc()->FixName);
     AlignParameter::AlignPairParamToRichParameterSet(currentArc()->ap, alignParamSet);
 
-	RichParameterListDialog ad(alignDialog,&alignParamSet,titleString);
+	RichParameterListDialog ad(alignDialog, alignParamSet, titleString);
     ad.setWindowFlags(Qt::Dialog);
     ad.setWindowModality(Qt::WindowModal);
     int result=ad.exec();
@@ -374,7 +374,7 @@ void EditAlignPlugin:: meshTreeParam()
 {
   RichParameterList  meshTreeParamSet;
   AlignParameter::MeshTreeParamToRichParameterSet(defaultMTP, meshTreeParamSet);
-  RichParameterListDialog ad(alignDialog,&meshTreeParamSet,"Default Alignment Parameters");
+  RichParameterListDialog ad(alignDialog, meshTreeParamSet, "Default Alignment Parameters");
   ad.setWindowFlags(Qt::Dialog);
   ad.setWindowModality(Qt::WindowModal);
   int result=ad.exec();
@@ -388,7 +388,7 @@ void EditAlignPlugin:: alignParam()
 {
     RichParameterList alignParamSet;
     AlignParameter::AlignPairParamToRichParameterSet(defaultAP, alignParamSet);
-	RichParameterListDialog ad(alignDialog,&alignParamSet,"Default Alignment Parameters");
+	RichParameterListDialog ad(alignDialog, alignParamSet, "Default Alignment Parameters");
     ad.setWindowFlags(Qt::Dialog);
     ad.setWindowModality(Qt::WindowModal);
     int result=ad.exec();
diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro
index 400ff8a9d..b7ed609ef 100644
--- a/src/meshlabplugins/edit_align/edit_align.pro
+++ b/src/meshlabplugins/edit_align/edit_align.pro
@@ -13,9 +13,9 @@ HEADERS += \
 	align/AlignGlobal.h \
 	align/OccupancyGrid.h \
 	align/align_parameter.h \
-	../../meshlab/meshlab_settings/richparameterwidgets.h \
-	../../meshlab/meshlab_settings/richparameterlistframe.h \
-	../../meshlab/meshlab_settings/richparameterlistdialog.h \
+	../../meshlab/rich_parameter_gui/richparameterwidgets.h \
+	../../meshlab/rich_parameter_gui/richparameterlistframe.h \
+	../../meshlab/rich_parameter_gui/richparameterlistdialog.h \
 	$$VCGDIR/wrap/gui/trackball.h \
 	$$VCGDIR/wrap/gui/trackmode.h \
 	$$VCGDIR/wrap/gl/trimesh.h
@@ -30,9 +30,9 @@ SOURCES += \
 	align/AlignGlobal.cpp \
 	align/OccupancyGrid.cpp \
 	align/align_parameter.cpp \
-	../../meshlab/meshlab_settings/richparameterwidgets.cpp \
-	../../meshlab/meshlab_settings/richparameterlistframe.cpp \
-	../../meshlab/meshlab_settings/richparameterlistdialog.cpp \
+	../../meshlab/rich_parameter_gui/richparameterwidgets.cpp \
+	../../meshlab/rich_parameter_gui/richparameterlistframe.cpp \
+	../../meshlab/rich_parameter_gui/richparameterlistdialog.cpp \
 	$$VCGDIR/wrap/ply/plylib.cpp\
 	$$VCGDIR/wrap/gui/trackball.cpp\
 	$$VCGDIR/wrap/gui/trackmode.cpp
diff --git a/src/meshlabplugins/edit_pickpoints/CMakeLists.txt b/src/meshlabplugins/edit_pickpoints/CMakeLists.txt
index 94806a57c..8b225bb60 100644
--- a/src/meshlabplugins/edit_pickpoints/CMakeLists.txt
+++ b/src/meshlabplugins/edit_pickpoints/CMakeLists.txt
@@ -12,9 +12,9 @@ set(SOURCES
 	pickPointsTemplate.cpp
 	pickedPoints.cpp
 	pickpointsDialog.cpp
-	../../meshlab/meshlab_settings/richparameterwidgets.cpp
-	../../meshlab/meshlab_settings/richparameterlistframe.cpp
-	../../meshlab/meshlab_settings/richparameterlistdialog.cpp)
+	../../meshlab/rich_parameter_gui/richparameterwidgets.cpp
+	../../meshlab/rich_parameter_gui/richparameterlistframe.cpp
+	../../meshlab/rich_parameter_gui/richparameterlistdialog.cpp)
 
 set(HEADERS
 	edit_pickpoints_factory.h
diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro b/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro
index 71c3bcc75..b4993e88b 100755
--- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro
+++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro
@@ -6,9 +6,9 @@ HEADERS += \
 	pickpointsDialog.h \
 	pickedPoints.h \
 	pickPointsTemplate.h \
-	../../meshlab/meshlab_settings/richparameterwidgets.h \
-	../../meshlab/meshlab_settings/richparameterlistframe.h \
-	../../meshlab/meshlab_settings/richparameterlistdialog.h
+	../../meshlab/rich_parameter_gui/richparameterwidgets.h \
+	../../meshlab/rich_parameter_gui/richparameterlistframe.h \
+	../../meshlab/rich_parameter_gui/richparameterlistdialog.h
 
 SOURCES += \
 	edit_pickpoints_factory.cpp \
@@ -16,9 +16,9 @@ SOURCES += \
 	pickpointsDialog.cpp \
 	pickedPoints.cpp \
 	pickPointsTemplate.cpp \
-	../../meshlab/meshlab_settings/richparameterwidgets.cpp \
-	../../meshlab/meshlab_settings/richparameterlistframe.cpp \
-	../../meshlab/meshlab_settings/richparameterlistdialog.cpp
+	../../meshlab/rich_parameter_gui/richparameterwidgets.cpp \
+	../../meshlab/rich_parameter_gui/richparameterlistframe.cpp \
+	../../meshlab/rich_parameter_gui/richparameterlistdialog.cpp
 
 RESOURCES += \
 	editpickpoints.qrc
diff --git a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
index 1333a1052..bcafa572d 100644
--- a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
+++ b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
@@ -30,8 +30,8 @@
 #include <math.h>
 
 #include <common/meshmodel.h>
-#include <meshlab/meshlab_settings/richparameterlistframe.h>
-#include <meshlab/meshlab_settings/richparameterlistdialog.h>
+#include <meshlab/rich_parameter_gui/richparameterlistframe.h>
+#include <meshlab/rich_parameter_gui/richparameterlistdialog.h>
 
 #include "editpickpoints.h"
 #include "pickpointsDialog.h"
@@ -660,7 +660,7 @@ void PickPointsDialog::renameHighlightedPoint() {
 		RichParameterList parameterSet;
 		parameterSet.addParam(RichString(newName, name, "New Name", "Enter the new name"));
 
-		RichParameterListDialog getNameDialog(this, &parameterSet);
+		RichParameterListDialog getNameDialog(this, parameterSet);
 		getNameDialog.setWindowModality(Qt::WindowModal);
 		getNameDialog.hide();