diff --git a/.gitattributes b/.gitattributes
index d8801686bb..b0a977f104 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1029,30 +1029,30 @@ components/paradox/lazparadox.pas svneol=native#text/plain
 components/paradox/regparadox.lrs svneol=native#text/plain
 components/paradox/regparadox.pp svneol=native#text/plain
 components/paradox/tparadox.png -text svneol=unset#image/png
-components/plotpanel/demo/event/frmmain.lfm svneol=native#text/plain
-components/plotpanel/demo/event/frmmain.lrs svneol=native#text/plain
-components/plotpanel/demo/event/frmmain.pp svneol=native#text/plain
-components/plotpanel/demo/event/ploteventdemo.ico -text svneol=unset#image/ico
-components/plotpanel/demo/event/ploteventdemo.lpi svneol=native#text/plain
-components/plotpanel/demo/event/ploteventdemo.lpr svneol=native#text/plain
-components/plotpanel/demo/event/ploteventdemo.rc svneol=native#text/plain
-components/plotpanel/demo/expression/exprdemo.ico -text svneol=unset#image/ico
-components/plotpanel/demo/expression/exprdemo.lpi svneol=native#text/plain
-components/plotpanel/demo/expression/exprdemo.lpr svneol=native#text/plain
-components/plotpanel/demo/expression/exprdemo.lrs svneol=native#text/plain
-components/plotpanel/demo/expression/exprdemo.rc svneol=native#text/plain
-components/plotpanel/demo/expression/frmmain.lfm svneol=native#text/plain
-components/plotpanel/demo/expression/frmmain.lrs svneol=native#text/plain
-components/plotpanel/demo/expression/frmmain.pp svneol=native#text/plain
-components/plotpanel/exprplotpanel.pp svneol=native#text/plain
-components/plotpanel/lazplotfunction.lpk svneol=native#text/plain
-components/plotpanel/lazplotfunction.pas svneol=native#text/plain
-components/plotpanel/plotpanel.pp svneol=native#text/plain
-components/plotpanel/readme.txt svneol=native#text/plain
-components/plotpanel/regplotpanel.lrs svneol=native#text/plain
-components/plotpanel/regplotpanel.pp svneol=native#text/plain
-components/plotpanel/tplotexpressionpanel.png -text svneol=unset#image/png
-components/plotpanel/tplotfunctionpanel.png -text svneol=unset#image/png
+components/plotfunction/demo/event/frmmain.lfm svneol=native#text/plain
+components/plotfunction/demo/event/frmmain.lrs svneol=native#text/plain
+components/plotfunction/demo/event/frmmain.pp svneol=native#text/plain
+components/plotfunction/demo/event/ploteventdemo.ico -text svneol=unset#image/ico
+components/plotfunction/demo/event/ploteventdemo.lpi svneol=native#text/plain
+components/plotfunction/demo/event/ploteventdemo.lpr svneol=native#text/plain
+components/plotfunction/demo/event/ploteventdemo.rc svneol=native#text/plain
+components/plotfunction/demo/expression/exprdemo.ico -text svneol=unset#image/ico
+components/plotfunction/demo/expression/exprdemo.lpi svneol=native#text/plain
+components/plotfunction/demo/expression/exprdemo.lpr svneol=native#text/plain
+components/plotfunction/demo/expression/exprdemo.lrs svneol=native#text/plain
+components/plotfunction/demo/expression/exprdemo.rc svneol=native#text/plain
+components/plotfunction/demo/expression/frmmain.lfm svneol=native#text/plain
+components/plotfunction/demo/expression/frmmain.lrs svneol=native#text/plain
+components/plotfunction/demo/expression/frmmain.pp svneol=native#text/plain
+components/plotfunction/exprplotpanel.pp svneol=native#text/plain
+components/plotfunction/lazplotfunction.lpk svneol=native#text/plain
+components/plotfunction/lazplotfunction.pas svneol=native#text/plain
+components/plotfunction/plotpanel.pp svneol=native#text/plain
+components/plotfunction/readme.txt svneol=native#text/plain
+components/plotfunction/regplotpanel.lrs svneol=native#text/plain
+components/plotfunction/regplotpanel.pp svneol=native#text/plain
+components/plotfunction/tplotexpressionpanel.png -text svneol=unset#image/png
+components/plotfunction/tplotfunctionpanel.png -text svneol=unset#image/png
 components/prettyformat/languages/pfidesource.de.po svneol=native#text/plain
 components/prettyformat/languages/pfidesource.fr.po svneol=native#text/plain
 components/prettyformat/languages/pfidesource.id.po svneol=native#text/plain
diff --git a/components/plotpanel/demo/event/frmmain.lfm b/components/plotfunction/demo/event/frmmain.lfm
similarity index 100%
rename from components/plotpanel/demo/event/frmmain.lfm
rename to components/plotfunction/demo/event/frmmain.lfm
diff --git a/components/plotpanel/demo/event/frmmain.lrs b/components/plotfunction/demo/event/frmmain.lrs
similarity index 100%
rename from components/plotpanel/demo/event/frmmain.lrs
rename to components/plotfunction/demo/event/frmmain.lrs
diff --git a/components/plotpanel/demo/event/frmmain.pp b/components/plotfunction/demo/event/frmmain.pp
similarity index 100%
rename from components/plotpanel/demo/event/frmmain.pp
rename to components/plotfunction/demo/event/frmmain.pp
diff --git a/components/plotpanel/demo/event/ploteventdemo.ico b/components/plotfunction/demo/event/ploteventdemo.ico
similarity index 100%
rename from components/plotpanel/demo/event/ploteventdemo.ico
rename to components/plotfunction/demo/event/ploteventdemo.ico
diff --git a/components/plotpanel/demo/event/ploteventdemo.lpi b/components/plotfunction/demo/event/ploteventdemo.lpi
similarity index 100%
rename from components/plotpanel/demo/event/ploteventdemo.lpi
rename to components/plotfunction/demo/event/ploteventdemo.lpi
diff --git a/components/plotpanel/demo/event/ploteventdemo.lpr b/components/plotfunction/demo/event/ploteventdemo.lpr
similarity index 100%
rename from components/plotpanel/demo/event/ploteventdemo.lpr
rename to components/plotfunction/demo/event/ploteventdemo.lpr
diff --git a/components/plotpanel/demo/event/ploteventdemo.rc b/components/plotfunction/demo/event/ploteventdemo.rc
similarity index 100%
rename from components/plotpanel/demo/event/ploteventdemo.rc
rename to components/plotfunction/demo/event/ploteventdemo.rc
diff --git a/components/plotpanel/demo/expression/exprdemo.ico b/components/plotfunction/demo/expression/exprdemo.ico
similarity index 100%
rename from components/plotpanel/demo/expression/exprdemo.ico
rename to components/plotfunction/demo/expression/exprdemo.ico
diff --git a/components/plotpanel/demo/expression/exprdemo.lpi b/components/plotfunction/demo/expression/exprdemo.lpi
similarity index 100%
rename from components/plotpanel/demo/expression/exprdemo.lpi
rename to components/plotfunction/demo/expression/exprdemo.lpi
diff --git a/components/plotpanel/demo/expression/exprdemo.lpr b/components/plotfunction/demo/expression/exprdemo.lpr
similarity index 100%
rename from components/plotpanel/demo/expression/exprdemo.lpr
rename to components/plotfunction/demo/expression/exprdemo.lpr
diff --git a/components/plotpanel/demo/expression/exprdemo.lrs b/components/plotfunction/demo/expression/exprdemo.lrs
similarity index 100%
rename from components/plotpanel/demo/expression/exprdemo.lrs
rename to components/plotfunction/demo/expression/exprdemo.lrs
diff --git a/components/plotpanel/demo/expression/exprdemo.rc b/components/plotfunction/demo/expression/exprdemo.rc
similarity index 100%
rename from components/plotpanel/demo/expression/exprdemo.rc
rename to components/plotfunction/demo/expression/exprdemo.rc
diff --git a/components/plotpanel/demo/expression/frmmain.lfm b/components/plotfunction/demo/expression/frmmain.lfm
similarity index 100%
rename from components/plotpanel/demo/expression/frmmain.lfm
rename to components/plotfunction/demo/expression/frmmain.lfm
diff --git a/components/plotpanel/demo/expression/frmmain.lrs b/components/plotfunction/demo/expression/frmmain.lrs
similarity index 100%
rename from components/plotpanel/demo/expression/frmmain.lrs
rename to components/plotfunction/demo/expression/frmmain.lrs
diff --git a/components/plotpanel/demo/expression/frmmain.pp b/components/plotfunction/demo/expression/frmmain.pp
similarity index 100%
rename from components/plotpanel/demo/expression/frmmain.pp
rename to components/plotfunction/demo/expression/frmmain.pp
diff --git a/components/plotpanel/exprplotpanel.pp b/components/plotfunction/exprplotpanel.pp
similarity index 100%
rename from components/plotpanel/exprplotpanel.pp
rename to components/plotfunction/exprplotpanel.pp
diff --git a/components/plotpanel/lazplotfunction.lpk b/components/plotfunction/lazplotfunction.lpk
similarity index 100%
rename from components/plotpanel/lazplotfunction.lpk
rename to components/plotfunction/lazplotfunction.lpk
diff --git a/components/plotpanel/lazplotfunction.pas b/components/plotfunction/lazplotfunction.pas
similarity index 100%
rename from components/plotpanel/lazplotfunction.pas
rename to components/plotfunction/lazplotfunction.pas
diff --git a/components/plotpanel/plotpanel.pp b/components/plotfunction/plotpanel.pp
similarity index 100%
rename from components/plotpanel/plotpanel.pp
rename to components/plotfunction/plotpanel.pp
diff --git a/components/plotpanel/readme.txt b/components/plotfunction/readme.txt
similarity index 100%
rename from components/plotpanel/readme.txt
rename to components/plotfunction/readme.txt
diff --git a/components/plotpanel/regplotpanel.lrs b/components/plotfunction/regplotpanel.lrs
similarity index 100%
rename from components/plotpanel/regplotpanel.lrs
rename to components/plotfunction/regplotpanel.lrs
diff --git a/components/plotpanel/regplotpanel.pp b/components/plotfunction/regplotpanel.pp
similarity index 100%
rename from components/plotpanel/regplotpanel.pp
rename to components/plotfunction/regplotpanel.pp
diff --git a/components/plotpanel/tplotexpressionpanel.png b/components/plotfunction/tplotexpressionpanel.png
similarity index 100%
rename from components/plotpanel/tplotexpressionpanel.png
rename to components/plotfunction/tplotexpressionpanel.png
diff --git a/components/plotpanel/tplotfunctionpanel.png b/components/plotfunction/tplotfunctionpanel.png
similarity index 100%
rename from components/plotpanel/tplotfunctionpanel.png
rename to components/plotfunction/tplotfunctionpanel.png
diff --git a/packager/globallinks/lazplotfunction.lpl b/packager/globallinks/lazplotfunction.lpl
index 48bd90d5ab..6efc1d6c89 100644
--- a/packager/globallinks/lazplotfunction.lpl
+++ b/packager/globallinks/lazplotfunction.lpl
@@ -1 +1 @@
-$(LazarusDir)/components/plotpanel/lazplotfunction.lpk
+$(LazarusDir)/components/plotfunction/lazplotfunction.lpk