diff --git a/Cargo.toml b/Cargo.toml
index 1fe7d4bb1d..02ee5200de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ name = "leo"
 path = "leo/main.rs"
 
 [workspace]
-members = [ "ast", "compiler", "gadgets", "leo-inputs", "types" ]
+members = [ "ast", "compiler", "gadgets", "leo-inputs", "typed" ]
 
 [dependencies]
 leo-compiler = { path = "compiler", version = "0.1.0" }
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
index d40dc7f889..7c647b846c 100644
--- a/compiler/Cargo.toml
+++ b/compiler/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 leo-ast = { path = "../ast", version = "0.1.0" }
 leo-gadgets = { path = "../gadgets", version = "0.1.0" }
 leo-inputs = { path = "../leo-inputs", version = "0.1.0" }
-leo-types = { path = "../types", version = "0.1.0" }
+leo-types = { path = "../typed", version = "0.1.0" }
 
 snarkos-curves = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", rev = "c7a56d9", default-features = false }
 snarkos-dpc = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", rev = "c7a56d9", default-features = false }
diff --git a/types/Cargo.toml b/typed/Cargo.toml
similarity index 100%
rename from types/Cargo.toml
rename to typed/Cargo.toml
diff --git a/types/src/circuits/circuit.rs b/typed/src/circuits/circuit.rs
similarity index 100%
rename from types/src/circuits/circuit.rs
rename to typed/src/circuits/circuit.rs
diff --git a/types/src/circuits/circuit_field_definition.rs b/typed/src/circuits/circuit_field_definition.rs
similarity index 100%
rename from types/src/circuits/circuit_field_definition.rs
rename to typed/src/circuits/circuit_field_definition.rs
diff --git a/types/src/circuits/circuit_member.rs b/typed/src/circuits/circuit_member.rs
similarity index 100%
rename from types/src/circuits/circuit_member.rs
rename to typed/src/circuits/circuit_member.rs
diff --git a/types/src/circuits/mod.rs b/typed/src/circuits/mod.rs
similarity index 100%
rename from types/src/circuits/mod.rs
rename to typed/src/circuits/mod.rs
diff --git a/types/src/common/assignee.rs b/typed/src/common/assignee.rs
similarity index 100%
rename from types/src/common/assignee.rs
rename to typed/src/common/assignee.rs
diff --git a/types/src/common/declare.rs b/typed/src/common/declare.rs
similarity index 100%
rename from types/src/common/declare.rs
rename to typed/src/common/declare.rs
diff --git a/types/src/common/identifier.rs b/typed/src/common/identifier.rs
similarity index 100%
rename from types/src/common/identifier.rs
rename to typed/src/common/identifier.rs
diff --git a/types/src/common/mod.rs b/typed/src/common/mod.rs
similarity index 100%
rename from types/src/common/mod.rs
rename to typed/src/common/mod.rs
diff --git a/types/src/common/range_or_expression.rs b/typed/src/common/range_or_expression.rs
similarity index 100%
rename from types/src/common/range_or_expression.rs
rename to typed/src/common/range_or_expression.rs
diff --git a/types/src/common/span.rs b/typed/src/common/span.rs
similarity index 100%
rename from types/src/common/span.rs
rename to typed/src/common/span.rs
diff --git a/types/src/common/spread_or_expression.rs b/typed/src/common/spread_or_expression.rs
similarity index 100%
rename from types/src/common/spread_or_expression.rs
rename to typed/src/common/spread_or_expression.rs
diff --git a/types/src/common/variable.rs b/typed/src/common/variable.rs
similarity index 100%
rename from types/src/common/variable.rs
rename to typed/src/common/variable.rs
diff --git a/types/src/errors/error.rs b/typed/src/errors/error.rs
similarity index 100%
rename from types/src/errors/error.rs
rename to typed/src/errors/error.rs
diff --git a/types/src/errors/mod.rs b/typed/src/errors/mod.rs
similarity index 100%
rename from types/src/errors/mod.rs
rename to typed/src/errors/mod.rs
diff --git a/types/src/expression.rs b/typed/src/expression.rs
similarity index 100%
rename from types/src/expression.rs
rename to typed/src/expression.rs
diff --git a/types/src/functions/function.rs b/typed/src/functions/function.rs
similarity index 100%
rename from types/src/functions/function.rs
rename to typed/src/functions/function.rs
diff --git a/types/src/functions/function_input.rs b/typed/src/functions/function_input.rs
similarity index 100%
rename from types/src/functions/function_input.rs
rename to typed/src/functions/function_input.rs
diff --git a/types/src/functions/mod.rs b/typed/src/functions/mod.rs
similarity index 100%
rename from types/src/functions/mod.rs
rename to typed/src/functions/mod.rs
diff --git a/types/src/functions/test_function.rs b/typed/src/functions/test_function.rs
similarity index 100%
rename from types/src/functions/test_function.rs
rename to typed/src/functions/test_function.rs
diff --git a/types/src/imports/import.rs b/typed/src/imports/import.rs
similarity index 100%
rename from types/src/imports/import.rs
rename to typed/src/imports/import.rs
diff --git a/types/src/imports/import_symbol.rs b/typed/src/imports/import_symbol.rs
similarity index 100%
rename from types/src/imports/import_symbol.rs
rename to typed/src/imports/import_symbol.rs
diff --git a/types/src/imports/mod.rs b/typed/src/imports/mod.rs
similarity index 100%
rename from types/src/imports/mod.rs
rename to typed/src/imports/mod.rs
diff --git a/types/src/imports/package.rs b/typed/src/imports/package.rs
similarity index 100%
rename from types/src/imports/package.rs
rename to typed/src/imports/package.rs
diff --git a/types/src/imports/package_access.rs b/typed/src/imports/package_access.rs
similarity index 100%
rename from types/src/imports/package_access.rs
rename to typed/src/imports/package_access.rs
diff --git a/types/src/inputs/input_value.rs b/typed/src/inputs/input_value.rs
similarity index 100%
rename from types/src/inputs/input_value.rs
rename to typed/src/inputs/input_value.rs
diff --git a/types/src/inputs/inputs.rs b/typed/src/inputs/inputs.rs
similarity index 100%
rename from types/src/inputs/inputs.rs
rename to typed/src/inputs/inputs.rs
diff --git a/types/src/inputs/mod.rs b/typed/src/inputs/mod.rs
similarity index 100%
rename from types/src/inputs/mod.rs
rename to typed/src/inputs/mod.rs
diff --git a/types/src/lib.rs b/typed/src/lib.rs
similarity index 100%
rename from types/src/lib.rs
rename to typed/src/lib.rs
diff --git a/types/src/macros/debug.rs b/typed/src/macros/debug.rs
similarity index 100%
rename from types/src/macros/debug.rs
rename to typed/src/macros/debug.rs
diff --git a/types/src/macros/error_macro.rs b/typed/src/macros/error_macro.rs
similarity index 100%
rename from types/src/macros/error_macro.rs
rename to typed/src/macros/error_macro.rs
diff --git a/types/src/macros/formatted_container.rs b/typed/src/macros/formatted_container.rs
similarity index 100%
rename from types/src/macros/formatted_container.rs
rename to typed/src/macros/formatted_container.rs
diff --git a/types/src/macros/formatted_macro.rs b/typed/src/macros/formatted_macro.rs
similarity index 100%
rename from types/src/macros/formatted_macro.rs
rename to typed/src/macros/formatted_macro.rs
diff --git a/types/src/macros/formatted_parameter.rs b/typed/src/macros/formatted_parameter.rs
similarity index 100%
rename from types/src/macros/formatted_parameter.rs
rename to typed/src/macros/formatted_parameter.rs
diff --git a/types/src/macros/formatted_string.rs b/typed/src/macros/formatted_string.rs
similarity index 100%
rename from types/src/macros/formatted_string.rs
rename to typed/src/macros/formatted_string.rs
diff --git a/types/src/macros/macro_name.rs b/typed/src/macros/macro_name.rs
similarity index 100%
rename from types/src/macros/macro_name.rs
rename to typed/src/macros/macro_name.rs
diff --git a/types/src/macros/mod.rs b/typed/src/macros/mod.rs
similarity index 100%
rename from types/src/macros/mod.rs
rename to typed/src/macros/mod.rs
diff --git a/types/src/macros/print.rs b/typed/src/macros/print.rs
similarity index 100%
rename from types/src/macros/print.rs
rename to typed/src/macros/print.rs
diff --git a/types/src/program.rs b/typed/src/program.rs
similarity index 100%
rename from types/src/program.rs
rename to typed/src/program.rs
diff --git a/types/src/statements/conditional_nested_or_end_statement.rs b/typed/src/statements/conditional_nested_or_end_statement.rs
similarity index 100%
rename from types/src/statements/conditional_nested_or_end_statement.rs
rename to typed/src/statements/conditional_nested_or_end_statement.rs
diff --git a/types/src/statements/conditional_statement.rs b/typed/src/statements/conditional_statement.rs
similarity index 100%
rename from types/src/statements/conditional_statement.rs
rename to typed/src/statements/conditional_statement.rs
diff --git a/types/src/statements/mod.rs b/typed/src/statements/mod.rs
similarity index 100%
rename from types/src/statements/mod.rs
rename to typed/src/statements/mod.rs
diff --git a/types/src/statements/statement.rs b/typed/src/statements/statement.rs
similarity index 100%
rename from types/src/statements/statement.rs
rename to typed/src/statements/statement.rs
diff --git a/types/src/types/integer_type.rs b/typed/src/types/integer_type.rs
similarity index 100%
rename from types/src/types/integer_type.rs
rename to typed/src/types/integer_type.rs
diff --git a/types/src/types/mod.rs b/typed/src/types/mod.rs
similarity index 100%
rename from types/src/types/mod.rs
rename to typed/src/types/mod.rs
diff --git a/types/src/types/type_.rs b/typed/src/types/type_.rs
similarity index 100%
rename from types/src/types/type_.rs
rename to typed/src/types/type_.rs