diff --git a/src/core/vhdl_parser.rs b/src/core/vhdl_parser.rs
index 0a87bb9..925f6c5 100644
--- a/src/core/vhdl_parser.rs
+++ b/src/core/vhdl_parser.rs
@@ -192,6 +192,11 @@ fn parse_tokens(tokens: Vec<Token>) -> Vec<Module> {
                         // };
                         // last_module_name = name.to_string();
                         // modules.push(module);
+                    } else {
+                        let module = modules.iter_mut().find(|module| module.name == name).unwrap();
+                        let arch_name = get_value(&tokens[i+1]);
+                        let entity_name = module.name.clone();
+                        module.name = entity_name + "(" + arch_name.as_str() + ")";
                     }
                 }
             }