Fix names of Models

src/8vert.cpp

@@ -81,4 +81,4 @@ _8vertWidget::_8vertWidget(_8vert *module) : ModuleWidget(module) {
 }
 
 
-Model *model_8vertWidget = Model::create<_8vert, _8vertWidget>("Fundamental", "8vert", "8vert", ATTENUATOR_TAG);
+Model *model_8vert = Model::create<_8vert, _8vertWidget>("Fundamental", "8vert", "8vert", ATTENUATOR_TAG);

src/ADSR.cpp

@@ -135,4 +135,4 @@ ADSRWidget::ADSRWidget(ADSR *module) : ModuleWidget(module) {
 }
 
 
-Model *modelADSRWidget = Model::create<ADSR, ADSRWidget>("Fundamental", "ADSR", "ADSR", ENVELOPE_GENERATOR_TAG);
+Model *modelADSR = Model::create<ADSR, ADSRWidget>("Fundamental", "ADSR", "ADSR", ENVELOPE_GENERATOR_TAG);

src/Delay.cpp

@@ -133,4 +133,4 @@ DelayWidget::DelayWidget(Delay *module) : ModuleWidget(module) {
 }
 
 
-Model *modelDelayWidget = Model::create<Delay, DelayWidget>("Fundamental", "Delay", "Delay", DELAY_TAG);
+Model *modelDelay = Model::create<Delay, DelayWidget>("Fundamental", "Delay", "Delay", DELAY_TAG);

src/Fundamental.cpp

@@ -8,20 +8,20 @@ void init(rack::Plugin *p) {
 	p->slug = TOSTRING(SLUG);
 	p->version = TOSTRING(VERSION);
 
-	p->addModel(modelVCOWidget);
-	p->addModel(modelVCO2Widget);
-	p->addModel(modelVCFWidget);
-	p->addModel(modelVCAWidget);
-	p->addModel(modelLFOWidget);
-	p->addModel(modelLFO2Widget);
-	p->addModel(modelDelayWidget);
-	p->addModel(modelADSRWidget);
-	p->addModel(modelVCMixerWidget);
-	p->addModel(model_8vertWidget);
-	p->addModel(modelUnityWidget);
-	p->addModel(modelMutesWidget);
-	p->addModel(modelScopeWidget);
-	p->addModel(modelSEQ3Widget);
-	p->addModel(modelSequentialSwitch1Widget);
-	p->addModel(modelSequentialSwitch2Widget);
+	p->addModel(modelVCO);
+	p->addModel(modelVCO2);
+	p->addModel(modelVCF);
+	p->addModel(modelVCA);
+	p->addModel(modelLFO);
+	p->addModel(modelLFO2);
+	p->addModel(modelDelay);
+	p->addModel(modelADSR);
+	p->addModel(modelVCMixer);
+	p->addModel(model_8vert);
+	p->addModel(modelUnity);
+	p->addModel(modelMutes);
+	p->addModel(modelScope);
+	p->addModel(modelSEQ3);
+	p->addModel(modelSequentialSwitch1);
+	p->addModel(modelSequentialSwitch2);
 }

src/Fundamental.hpp

@@ -6,21 +6,21 @@ using namespace rack;
 
 extern Plugin *plugin;
 
-extern Model *modelVCOWidget;
-extern Model *modelVCO2Widget;
-extern Model *modelVCFWidget;
-extern Model *modelVCAWidget;
-extern Model *modelLFOWidget;
-extern Model *modelLFO2Widget;
-extern Model *modelDelayWidget;
-extern Model *modelADSRWidget;
-extern Model *modelVCMixerWidget;
-extern Model *model_8vertWidget;
-extern Model *modelUnityWidget;
-extern Model *modelMutesWidget;
-extern Model *modelScopeWidget;
-extern Model *modelSEQ3Widget;
-extern Model *modelSequentialSwitch1Widget;
-extern Model *modelSequentialSwitch2Widget;
+extern Model *modelVCO;
+extern Model *modelVCO2;
+extern Model *modelVCF;
+extern Model *modelVCA;
+extern Model *modelLFO;
+extern Model *modelLFO2;
+extern Model *modelDelay;
+extern Model *modelADSR;
+extern Model *modelVCMixer;
+extern Model *model_8vert;
+extern Model *modelUnity;
+extern Model *modelMutes;
+extern Model *modelScope;
+extern Model *modelSEQ3;
+extern Model *modelSequentialSwitch1;
+extern Model *modelSequentialSwitch2;
 
 

src/LFO.cpp

@@ -155,7 +155,7 @@ LFOWidget::LFOWidget(LFO *module) : ModuleWidget(module) {
 }
 
 
-Model *modelLFOWidget = Model::create<LFO, LFOWidget>("Fundamental", "LFO", "LFO-1", LFO_TAG);
+Model *modelLFO = Model::create<LFO, LFOWidget>("Fundamental", "LFO", "LFO-1", LFO_TAG);
 
 
 struct LFO2 : Module {
@@ -242,4 +242,4 @@ LFO2Widget::LFO2Widget(LFO2 *module) : ModuleWidget(module) {
 }
 
 
-Model *modelLFO2Widget = Model::create<LFO2, LFO2Widget>("Fundamental", "LFO2", "LFO-2", LFO_TAG);
+Model *modelLFO2 = Model::create<LFO2, LFO2Widget>("Fundamental", "LFO2", "LFO-2", LFO_TAG);

src/Mutes.cpp

@@ -145,4 +145,4 @@ MutesWidget::MutesWidget(Mutes *module) : ModuleWidget(module) {
 }
 
 
-Model *modelMutesWidget = Model::create<Mutes, MutesWidget>("Fundamental", "Mutes", "Mutes", SWITCH_TAG);
+Model *modelMutes = Model::create<Mutes, MutesWidget>("Fundamental", "Mutes", "Mutes", SWITCH_TAG);

src/SEQ3.cpp

@@ -301,4 +301,4 @@ Menu *SEQ3Widget::createContextMenu() {
 }
 
 
-Model *modelSEQ3Widget = Model::create<SEQ3, SEQ3Widget>("Fundamental", "SEQ3", "SEQ-3", SEQUENCER_TAG);
+Model *modelSEQ3 = Model::create<SEQ3, SEQ3Widget>("Fundamental", "SEQ3", "SEQ-3", SEQUENCER_TAG);

src/Scope.cpp

@@ -339,4 +339,4 @@ ScopeWidget::ScopeWidget(Scope *module) : ModuleWidget(module) {
 }
 
 
-Model *modelScopeWidget = Model::create<Scope, ScopeWidget>("Fundamental", "Scope", "Scope", VISUAL_TAG);
+Model *modelScope = Model::create<Scope, ScopeWidget>("Fundamental", "Scope", "Scope", VISUAL_TAG);

src/SequentialSwitch.cpp

@@ -104,7 +104,7 @@ SequentialSwitch1Widget::SequentialSwitch1Widget(SequentialSwitch<1> *module) :
 }
 
 
-Model *modelSequentialSwitch1Widget = Model::create<SequentialSwitch<1>, SequentialSwitch1Widget>("Fundamental", "SequentialSwitch1", "Sequential Switch 1", UTILITY_TAG);
+Model *modelSequentialSwitch1 = Model::create<SequentialSwitch<1>, SequentialSwitch1Widget>("Fundamental", "SequentialSwitch1", "Sequential Switch 1", UTILITY_TAG);
 
 
 struct SequentialSwitch2Widget : ModuleWidget {
@@ -136,4 +136,4 @@ SequentialSwitch2Widget::SequentialSwitch2Widget(SequentialSwitch<2> *module) :
 }
 
 
-Model *modelSequentialSwitch2Widget = Model::create<SequentialSwitch<2>, SequentialSwitch2Widget>("Fundamental", "SequentialSwitch2", "Sequential Switch 2", UTILITY_TAG);
+Model *modelSequentialSwitch2 = Model::create<SequentialSwitch<2>, SequentialSwitch2Widget>("Fundamental", "SequentialSwitch2", "Sequential Switch 2", UTILITY_TAG);

src/Unity.cpp

@@ -165,4 +165,4 @@ Menu *UnityWidget::createContextMenu() {
 }
 
 
-Model *modelUnityWidget = Model::create<Unity, UnityWidget>("Fundamental", "Unity", "Unity", MIXER_TAG, UTILITY_TAG);
+Model *modelUnity = Model::create<Unity, UnityWidget>("Fundamental", "Unity", "Unity", MIXER_TAG, UTILITY_TAG);

src/VCA.cpp

@@ -70,4 +70,4 @@ VCAWidget::VCAWidget(VCA *module) : ModuleWidget(module) {
 }
 
 
-Model *modelVCAWidget = Model::create<VCA, VCAWidget>("Fundamental", "VCA", "VCA", AMPLIFIER_TAG);
+Model *modelVCA = Model::create<VCA, VCAWidget>("Fundamental", "VCA", "VCA", AMPLIFIER_TAG);

src/VCF.cpp

@@ -172,4 +172,4 @@ VCFWidget::VCFWidget(VCF *module) : ModuleWidget(module) {
 }
 
 
-Model *modelVCFWidget = Model::create<VCF, VCFWidget>("Fundamental", "VCF", "VCF", FILTER_TAG);
+Model *modelVCF = Model::create<VCF, VCFWidget>("Fundamental", "VCF", "VCF", FILTER_TAG);

src/VCMixer.cpp

@@ -78,4 +78,4 @@ VCMixerWidget::VCMixerWidget(VCMixer *module) : ModuleWidget(module) {
 }
 
 
-Model *modelVCMixerWidget = Model::create<VCMixer, VCMixerWidget>("Fundamental", "VCMixer", "VC Mixer", MIXER_TAG, AMPLIFIER_TAG);
+Model *modelVCMixer = Model::create<VCMixer, VCMixerWidget>("Fundamental", "VCMixer", "VC Mixer", MIXER_TAG, AMPLIFIER_TAG);

src/VCO.cpp

@@ -265,7 +265,7 @@ VCOWidget::VCOWidget(VCO *module) : ModuleWidget(module) {
 }
 
 
-Model *modelVCOWidget = Model::create<VCO, VCOWidget>("Fundamental", "VCO", "VCO-1", OSCILLATOR_TAG);
+Model *modelVCO = Model::create<VCO, VCOWidget>("Fundamental", "VCO", "VCO-1", OSCILLATOR_TAG);
 
 
 struct VCO2 : Module {
@@ -355,7 +355,7 @@ VCO2Widget::VCO2Widget(VCO2 *module) : ModuleWidget(module) {
 }
 
 
-Model *modelVCO2Widget = Model::create<VCO2, VCO2Widget>("Fundamental", "VCO2", "VCO-2", OSCILLATOR_TAG);
+Model *modelVCO2 = Model::create<VCO2, VCO2Widget>("Fundamental", "VCO2", "VCO-2", OSCILLATOR_TAG);
 
 
 float sawTable[2048] = {