diff --git a/grammar/declarations/type_declarations.bnf b/grammar/declarations/type_declarations.bnf
index 8b8a855..49a9d81 100644
--- a/grammar/declarations/type_declarations.bnf
+++ b/grammar/declarations/type_declarations.bnf
@@ -1,5 +1,4 @@
-<type_declaration> ::= <identifier> 
-    ["/" <identifier>]? 
+<type_declaration> ::= <inherited_type> 
     ["->" <interface_identifier_list>]? 
     "{" <class_body> "}"
 
@@ -9,9 +8,11 @@
                 | <constructor_declaration> 
                 | <destructor_declaration>)*
 
-<type_inheritance> ::= "extends" <identifier>
+<inherited_type> ::= [<parent> "/"]? <child>
 
-<generic_type_declaration> ::= <identifier> "<" <type_parameter_list> ">"
+<parent> ::= <identifier>
+
+<child> ::= <identifier>
 
 <type_parameter_list> ::= <identifier> ("," <identifier>)*
 
diff --git a/grammar/interfaces/interface_definitions.bnf b/grammar/interfaces/interface_definitions.bnf
index 6e42c06..884c607 100644
--- a/grammar/interfaces/interface_definitions.bnf
+++ b/grammar/interfaces/interface_definitions.bnf
@@ -12,10 +12,6 @@
 <interface_method_signature> ::= 
     <accessibility_modifier>"fn" <identifier> <function_signature>
 
-<generic_interface_declaration> ::= 
-    "@" <interface_identifier> "<" <type_parameter_list> ">" 
-    "{" <interface_body> "}"
-
 <interface_inheritance> ::= 
     "@" <interface_identifier> "extends" <interface_identifier_list> 
     "{" <interface_body> "}"