diff --git a/.gitmodules b/.gitmodules
index d1e4404a3613e5d1cc38a2f27aa3d750d0db2de2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "dlfcn-win32"]
-	path = dlfcn-win32
-	url = https://github.com/dlfcn-win32/dlfcn-win32.git
diff --git a/componant/cap.cpp b/componant/cap.cpp
index 05ab41e1c9b97e95e6c3ceb8f5f8c04c04aaa22b..935a6157af7e050b815262879ef8348894bb1361 100644
--- a/componant/cap.cpp
+++ b/componant/cap.cpp
@@ -20,7 +20,7 @@ Cap::Cap(std::string paramStr, size_t count, bool defaultToRange)
 
 	if(ranges.size() != paramCount())
 	{
-		ranges = getDefaultRange(defaultToRange);
+		ranges = getDefaultParameters(defaultToRange);
 		if(defaultToRange)
 		{
 			for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Cap::Cap(std::string paramStr, size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> Cap::getDefaultRange(bool range) const
+std::vector<eis::Range> Cap::getDefaultParameters(bool range) const
 {
 	std::vector<eis::Range> out;
 
diff --git a/componant/componant.cpp b/componant/componant.cpp
index d0487829dcaf01f8701f1b29973c11a819dcd9d5..5b7a26ba79f9aea9cbd50363d6ae66242c206f8b 100644
--- a/componant/componant.cpp
+++ b/componant/componant.cpp
@@ -28,7 +28,7 @@ std::vector<eis::Range> Componant::getParamRanges() const
 	return ranges;
 }
 
-std::vector<eis::Range> Componant::getDefaultRange(bool range) const
+std::vector<eis::Range> Componant::getDefaultParameters(bool range) const
 {
 	(void)range;
 	assert(paramCount() == 0);
diff --git a/componant/constantphase.cpp b/componant/constantphase.cpp
index ca9ddf1f02a430b0fb750bdb457365ff947840ba..6bbc251b230947d56b7f3ddccdc82d870b462f82 100644
--- a/componant/constantphase.cpp
+++ b/componant/constantphase.cpp
@@ -40,7 +40,7 @@ Cpe::Cpe(std::string paramStr, size_t count, bool defaultToRange)
 
 void Cpe::setDefaultParam(size_t count, bool defaultToRange)
 {
-	ranges = getDefaultRange(defaultToRange);
+	ranges = getDefaultParameters(defaultToRange);
 	if(defaultToRange)
 	{
 		for(eis::Range& range : ranges)
@@ -48,7 +48,7 @@ void Cpe::setDefaultParam(size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> Cpe::getDefaultRange(bool range) const
+std::vector<eis::Range> Cpe::getDefaultParameters(bool range) const
 {
 	std::vector<eis::Range> out;
 
diff --git a/componant/finitetr.cpp b/componant/finitetr.cpp
index f1a89dfd771d6e8b2a71b3d2a0523b06641c443f..252ee1b492b214a01a33fdeffced5d458ceeaf28 100644
--- a/componant/finitetr.cpp
+++ b/componant/finitetr.cpp
@@ -32,7 +32,7 @@ void FiniteTransmitionline::setDefaultParam(size_t count, bool defaultToRange)
 	_R = 1000;
 	_n = 4;
 
-	ranges = getDefaultRange(defaultToRange);
+	ranges = getDefaultParameters(defaultToRange);
 
 	if(defaultToRange)
 	{
@@ -41,7 +41,7 @@ void FiniteTransmitionline::setDefaultParam(size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> FiniteTransmitionline::getDefaultRange(bool range) const
+std::vector<eis::Range> FiniteTransmitionline::getDefaultParameters(bool range) const
 {
 	const fvalue C = 1e-6;
 	const fvalue R = 1000;
diff --git a/componant/inductor.cpp b/componant/inductor.cpp
index b0b3f019284f3b19d54ea6d87db52d4771e68ec1..f2fc73c6cb23a300c350990d2e6459fdf94b850a 100644
--- a/componant/inductor.cpp
+++ b/componant/inductor.cpp
@@ -20,7 +20,7 @@ Inductor::Inductor(std::string paramStr, size_t count, bool defaultToRange)
 
 	if(ranges.size() != paramCount())
 	{
-		ranges = getDefaultRange(defaultToRange);
+		ranges = getDefaultParameters(defaultToRange);
 		if(defaultToRange)
 		{
 			for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Inductor::Inductor(std::string paramStr, size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> Inductor::getDefaultRange(bool range) const
+std::vector<eis::Range> Inductor::getDefaultParameters(bool range) const
 {
 	std::vector<eis::Range> out;
 
diff --git a/componant/resistor.cpp b/componant/resistor.cpp
index 06d370157dbf1350cc851e0528fd9d9c9f8ee2f9..59e3dbe54aa28170780c9c0584bf5581a3f9b152 100644
--- a/componant/resistor.cpp
+++ b/componant/resistor.cpp
@@ -20,7 +20,7 @@ Resistor::Resistor(std::string paramStr, size_t count, bool defaultToRange)
 
 	if(ranges.size() != paramCount())
 	{
-		ranges = getDefaultRange(defaultToRange);
+		ranges = getDefaultParameters(defaultToRange);
 		if(defaultToRange)
 		{
 			for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Resistor::Resistor(std::string paramStr, size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> Resistor::getDefaultRange(bool range) const
+std::vector<eis::Range> Resistor::getDefaultParameters(bool range) const
 {
 	std::vector<eis::Range> out;
 
diff --git a/componant/warburg.cpp b/componant/warburg.cpp
index c5b58a9af8232ff3d7059d6c7f6c51672a228f9c..ddc1f6f2ce32424f758b2405ed127a639927472c 100644
--- a/componant/warburg.cpp
+++ b/componant/warburg.cpp
@@ -20,7 +20,7 @@ Warburg::Warburg(std::string paramStr, size_t count, bool defaultToRange)
 
 	if(ranges.size() != paramCount())
 	{
-		ranges = getDefaultRange(defaultToRange);
+		ranges = getDefaultParameters(defaultToRange);
 		if(defaultToRange)
 		{
 			for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Warburg::Warburg(std::string paramStr, size_t count, bool defaultToRange)
 	}
 }
 
-std::vector<eis::Range> Warburg::getDefaultRange(bool range) const
+std::vector<eis::Range> Warburg::getDefaultParameters(bool range) const
 {
 	std::vector<eis::Range> out;
 
diff --git a/eisgenerator/componant/cap.h b/eisgenerator/componant/cap.h
index 31038c217c4beca14c2a411145365eb7b8e85769..7483e1130603faa060204d7f903b6331afb40e5d 100644
--- a/eisgenerator/componant/cap.h
+++ b/eisgenerator/componant/cap.h
@@ -19,7 +19,7 @@ public:
 	virtual std::string componantName() const override {return "Capacitor";}
 	virtual std::string getCode(std::vector<std::string>& parameters) override;
 	virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual ~Cap() = default;
 };
 
diff --git a/eisgenerator/componant/componant.h b/eisgenerator/componant/componant.h
index 93e33e0a4b11e5480942e36474ade921836c00e9..b14b93f050f2ff8e3162606fa46162056e30c070 100644
--- a/eisgenerator/componant/componant.h
+++ b/eisgenerator/componant/componant.h
@@ -26,7 +26,7 @@ class Componant
 		virtual void setParamRanges(const std::vector<eis::Range>& ranges);
 		virtual std::vector<eis::Range>& getParamRanges();
 		virtual std::vector<eis::Range> getParamRanges() const;
-		virtual std::vector<eis::Range> getDefaultRange(bool range = true) const;
+		virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const;
 		virtual size_t paramCount() const {return 0;};
 		virtual ~Componant() = default;
 		virtual char getComponantChar() const = 0;
diff --git a/eisgenerator/componant/constantphase.h b/eisgenerator/componant/constantphase.h
index e4252f5d93548380c51f7156084e7f222e6979c8..766006ddb28a65bd0ed264a4d5842133d48872b6 100644
--- a/eisgenerator/componant/constantphase.h
+++ b/eisgenerator/componant/constantphase.h
@@ -21,7 +21,7 @@ public:
 	static constexpr char staticGetComponantChar(){return 'p';}
 	virtual std::string componantName() const override {return "ConstantPhase";}
 	virtual ~Cpe() = default;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual std::string getCode(std::vector<std::string>& parameters) override;
 	virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
 };
diff --git a/eisgenerator/componant/finitetr.h b/eisgenerator/componant/finitetr.h
index dfd4277597085e684bb03e67d5344a9dee7f32e0..2aaf03c265caa44631bbe5eb195d6fc4e8fc5541 100644
--- a/eisgenerator/componant/finitetr.h
+++ b/eisgenerator/componant/finitetr.h
@@ -22,7 +22,7 @@ public:
 	FiniteTransmitionline(const FiniteTransmitionline& in);
 	virtual std::complex<fvalue> execute(fvalue omega) override;
 	virtual size_t paramCount() const override;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual ~FiniteTransmitionline();
 	virtual char getComponantChar() const override;
 	virtual std::string componantName() const override {return "FiniteTransmitionline";}
diff --git a/eisgenerator/componant/inductor.h b/eisgenerator/componant/inductor.h
index e4afd6c6e2e98c6d1d9dafcc126e31c67d99785f..3f3663a7c35e6db20bed3d8eb123a139e25243d4 100644
--- a/eisgenerator/componant/inductor.h
+++ b/eisgenerator/componant/inductor.h
@@ -18,7 +18,7 @@ public:
 	static constexpr char staticGetComponantChar(){return 'l';}
 	virtual std::string componantName() const override {return "Inductor";}
 	virtual std::string getCode(std::vector<std::string>& parameters) override;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
 	virtual ~Inductor() = default;
 };
diff --git a/eisgenerator/componant/resistor.h b/eisgenerator/componant/resistor.h
index 26575346f110cd594b603c51fb8a885ef1a98ca7..a5def55a71fa5e43d9c0768f45b3bd2534b04685 100644
--- a/eisgenerator/componant/resistor.h
+++ b/eisgenerator/componant/resistor.h
@@ -16,7 +16,7 @@ public:
 	static constexpr char staticGetComponantChar(){return 'r';}
 	virtual std::string componantName() const override {return "Resistor";}
 	virtual std::string getCode(std::vector<std::string>& parameters) override;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
 	virtual ~Resistor() = default;
 };
diff --git a/eisgenerator/componant/warburg.h b/eisgenerator/componant/warburg.h
index 7529bf7bdbf029582be0baf1e324ea4a5c5f83f6..a0c734621771e3ee1397fccf1fd070cf9f8e1216 100644
--- a/eisgenerator/componant/warburg.h
+++ b/eisgenerator/componant/warburg.h
@@ -18,7 +18,7 @@ public:
 	static constexpr char staticGetComponantChar(){return 'w';}
 	virtual std::string componantName() const override {return "Warburg";}
 	virtual std::string getCode(std::vector<std::string>& parameters) override;
-	virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+	virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
 	virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
 	virtual ~Warburg() = default;
 };