diff --git a/compiler/src/compiler.rs b/compiler/src/compiler.rs
index 464631a508..286e985583 100644
--- a/compiler/src/compiler.rs
+++ b/compiler/src/compiler.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_ast::LeoAst;
 use leo_inputs::LeoInputsParser;
-use leo_types::{InputValue, Inputs, LeoTypedAst, Program};
+use leo_typed::{InputValue, Inputs, LeoTypedAst, Program};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/constraints/constraints.rs b/compiler/src/constraints/constraints.rs
index a732de9099..ce55100b93 100644
--- a/compiler/src/constraints/constraints.rs
+++ b/compiler/src/constraints/constraints.rs
@@ -1,7 +1,7 @@
 //! Generates R1CS constraints for a compiled Leo program.
 
 use crate::{errors::CompilerError, new_scope, ConstrainedProgram, ConstrainedValue, GroupType, ImportParser};
-use leo_types::{InputValue, Program};
+use leo_typed::{InputValue, Program};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/definition/definition.rs b/compiler/src/definition/definition.rs
index 796a0fbbc1..2c00abb86d 100644
--- a/compiler/src/definition/definition.rs
+++ b/compiler/src/definition/definition.rs
@@ -5,7 +5,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_types::Variable;
+use leo_typed::Variable;
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/definition/definitions.rs b/compiler/src/definition/definitions.rs
index 56d77c1cf9..cf377444bc 100644
--- a/compiler/src/definition/definitions.rs
+++ b/compiler/src/definition/definitions.rs
@@ -7,7 +7,7 @@ use crate::{
     GroupType,
     ImportParser,
 };
-use leo_types::Program;
+use leo_typed::Program;
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/errors/expression.rs b/compiler/src/errors/expression.rs
index 17f2167248..5e87cf5082 100644
--- a/compiler/src/errors/expression.rs
+++ b/compiler/src/errors/expression.rs
@@ -1,5 +1,5 @@
 use crate::errors::{AddressError, BooleanError, FieldError, FunctionError, GroupError, IntegerError, ValueError};
-use leo_types::{Error as FormattedError, Identifier, Span};
+use leo_typed::{Error as FormattedError, Identifier, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::PathBuf;
diff --git a/compiler/src/errors/function.rs b/compiler/src/errors/function.rs
index 60c694ace4..609847c695 100644
--- a/compiler/src/errors/function.rs
+++ b/compiler/src/errors/function.rs
@@ -8,7 +8,7 @@ use crate::errors::{
     StatementError,
     ValueError,
 };
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use std::path::PathBuf;
 
diff --git a/compiler/src/errors/import.rs b/compiler/src/errors/import.rs
index 2da0f83197..0a96438afe 100644
--- a/compiler/src/errors/import.rs
+++ b/compiler/src/errors/import.rs
@@ -1,5 +1,5 @@
 use leo_ast::ParserError;
-use leo_types::{Error as FormattedError, Identifier, ImportSymbol, Span};
+use leo_typed::{Error as FormattedError, Identifier, ImportSymbol, Span};
 
 use std::{io, path::PathBuf};
 
diff --git a/compiler/src/errors/macro_.rs b/compiler/src/errors/macro_.rs
index 5a95104fb1..83c25fe76e 100644
--- a/compiler/src/errors/macro_.rs
+++ b/compiler/src/errors/macro_.rs
@@ -1,5 +1,5 @@
 use crate::errors::ExpressionError;
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use std::path::PathBuf;
 
diff --git a/compiler/src/errors/statement.rs b/compiler/src/errors/statement.rs
index c1f345272e..3f838a966b 100644
--- a/compiler/src/errors/statement.rs
+++ b/compiler/src/errors/statement.rs
@@ -1,5 +1,5 @@
 use crate::errors::{AddressError, BooleanError, ExpressionError, IntegerError, MacroError, ValueError};
-use leo_types::{Error as FormattedError, Span, Type};
+use leo_typed::{Error as FormattedError, Span, Type};
 
 use std::path::PathBuf;
 
diff --git a/compiler/src/errors/value/address.rs b/compiler/src/errors/value/address.rs
index edb675abca..9f9c131f17 100644
--- a/compiler/src/errors/value/address.rs
+++ b/compiler/src/errors/value/address.rs
@@ -1,4 +1,4 @@
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use snarkos_errors::{gadgets::SynthesisError, objects::account::AccountError};
 use std::path::PathBuf;
diff --git a/compiler/src/errors/value/boolean.rs b/compiler/src/errors/value/boolean.rs
index bea08d67e4..9b96b586b4 100644
--- a/compiler/src/errors/value/boolean.rs
+++ b/compiler/src/errors/value/boolean.rs
@@ -1,4 +1,4 @@
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::PathBuf;
diff --git a/compiler/src/errors/value/field.rs b/compiler/src/errors/value/field.rs
index 3fc81f200d..3c93b72143 100644
--- a/compiler/src/errors/value/field.rs
+++ b/compiler/src/errors/value/field.rs
@@ -1,4 +1,4 @@
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::PathBuf;
diff --git a/compiler/src/errors/value/group.rs b/compiler/src/errors/value/group.rs
index 6531cc356e..75b42d596d 100644
--- a/compiler/src/errors/value/group.rs
+++ b/compiler/src/errors/value/group.rs
@@ -1,4 +1,4 @@
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::PathBuf;
diff --git a/compiler/src/errors/value/integer.rs b/compiler/src/errors/value/integer.rs
index 9f17f19a31..67e57ecae7 100644
--- a/compiler/src/errors/value/integer.rs
+++ b/compiler/src/errors/value/integer.rs
@@ -1,5 +1,5 @@
 use leo_gadgets::errors::SignedIntegerError;
-use leo_types::{error::Error as FormattedError, Span};
+use leo_typed::{error::Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::PathBuf;
diff --git a/compiler/src/errors/value/value.rs b/compiler/src/errors/value/value.rs
index 2a7ade0661..af47546962 100644
--- a/compiler/src/errors/value/value.rs
+++ b/compiler/src/errors/value/value.rs
@@ -1,5 +1,5 @@
 use crate::errors::{AddressError, BooleanError, FieldError, GroupError, IntegerError};
-use leo_types::{Error as FormattedError, Span};
+use leo_typed::{Error as FormattedError, Span};
 
 use std::path::PathBuf;
 
diff --git a/compiler/src/expression/arithmetic/add.rs b/compiler/src/expression/arithmetic/add.rs
index e62ccfee78..e7117101fe 100644
--- a/compiler/src/expression/arithmetic/add.rs
+++ b/compiler/src/expression/arithmetic/add.rs
@@ -1,7 +1,7 @@
 //! Enforces an arithmetic `+` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/arithmetic/div.rs b/compiler/src/expression/arithmetic/div.rs
index 3f2a6c82c6..0545f8b229 100644
--- a/compiler/src/expression/arithmetic/div.rs
+++ b/compiler/src/expression/arithmetic/div.rs
@@ -1,7 +1,7 @@
 //! Enforces an arithmetic `/` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/arithmetic/mul.rs b/compiler/src/expression/arithmetic/mul.rs
index 9742c6ee83..f9b58aa5c0 100644
--- a/compiler/src/expression/arithmetic/mul.rs
+++ b/compiler/src/expression/arithmetic/mul.rs
@@ -1,7 +1,7 @@
 //! Enforces an arithmetic `*` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/arithmetic/pow.rs b/compiler/src/expression/arithmetic/pow.rs
index b817436c7f..737fa15ffa 100644
--- a/compiler/src/expression/arithmetic/pow.rs
+++ b/compiler/src/expression/arithmetic/pow.rs
@@ -1,7 +1,7 @@
 //! Enforces an arithmetic `**` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/arithmetic/sub.rs b/compiler/src/expression/arithmetic/sub.rs
index aca482b6b3..efd87a6b9e 100644
--- a/compiler/src/expression/arithmetic/sub.rs
+++ b/compiler/src/expression/arithmetic/sub.rs
@@ -1,7 +1,7 @@
 //! Enforces an arithmetic `-` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/array/access.rs b/compiler/src/expression/array/access.rs
index dfe8da05e9..d2794774f2 100644
--- a/compiler/src/expression/array/access.rs
+++ b/compiler/src/expression/array/access.rs
@@ -1,7 +1,7 @@
 //! Enforces array access in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, RangeOrExpression, Span, Type};
+use leo_typed::{Expression, RangeOrExpression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/array/array.rs b/compiler/src/expression/array/array.rs
index 070b28a2ec..2b5fdb7bb6 100644
--- a/compiler/src/expression/array/array.rs
+++ b/compiler/src/expression/array/array.rs
@@ -6,7 +6,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_types::{Expression, Span, SpreadOrExpression, Type};
+use leo_typed::{Expression, Span, SpreadOrExpression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/array/index.rs b/compiler/src/expression/array/index.rs
index a8aa4ca390..f3ef721cba 100644
--- a/compiler/src/expression/array/index.rs
+++ b/compiler/src/expression/array/index.rs
@@ -1,7 +1,7 @@
 //! Enforces an array index expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, IntegerType, Span, Type};
+use leo_typed::{Expression, IntegerType, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/binary/binary.rs b/compiler/src/expression/binary/binary.rs
index c4502ac68b..e6033c8b91 100644
--- a/compiler/src/expression/binary/binary.rs
+++ b/compiler/src/expression/binary/binary.rs
@@ -1,7 +1,7 @@
 //! Enforces a binary expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, Span, Type};
+use leo_typed::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/binary/operand.rs b/compiler/src/expression/binary/operand.rs
index 65ce939bbc..f1f688f79d 100644
--- a/compiler/src/expression/binary/operand.rs
+++ b/compiler/src/expression/binary/operand.rs
@@ -1,7 +1,7 @@
 //! Enforces one operand in a binary expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, Span, Type};
+use leo_typed::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/circuit/access.rs b/compiler/src/expression/circuit/access.rs
index d7d672f5dd..5e6f9744e2 100644
--- a/compiler/src/expression/circuit/access.rs
+++ b/compiler/src/expression/circuit/access.rs
@@ -6,7 +6,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_types::{Expression, Identifier, Span, Type};
+use leo_typed::{Expression, Identifier, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/circuit/circuit.rs b/compiler/src/expression/circuit/circuit.rs
index fe1f5332aa..dd39deab72 100644
--- a/compiler/src/expression/circuit/circuit.rs
+++ b/compiler/src/expression/circuit/circuit.rs
@@ -6,7 +6,7 @@ use crate::{
     value::{ConstrainedCircuitMember, ConstrainedValue},
     GroupType,
 };
-use leo_types::{CircuitFieldDefinition, CircuitMember, Identifier, Span};
+use leo_typed::{CircuitFieldDefinition, CircuitMember, Identifier, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/circuit/static_access.rs b/compiler/src/expression/circuit/static_access.rs
index 2afa33b20e..14d8317aa5 100644
--- a/compiler/src/expression/circuit/static_access.rs
+++ b/compiler/src/expression/circuit/static_access.rs
@@ -1,7 +1,7 @@
 //! Enforces a circuit static access expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{CircuitMember, Expression, Identifier, Span, Type};
+use leo_typed::{CircuitMember, Expression, Identifier, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/conditional/conditional.rs b/compiler/src/expression/conditional/conditional.rs
index 53df643584..b47ca5e4b4 100644
--- a/compiler/src/expression/conditional/conditional.rs
+++ b/compiler/src/expression/conditional/conditional.rs
@@ -1,7 +1,7 @@
 //! Enforces a conditional expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, Span, Type};
+use leo_typed::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/expression.rs b/compiler/src/expression/expression.rs
index 49b6b83b9f..43185fec4b 100644
--- a/compiler/src/expression/expression.rs
+++ b/compiler/src/expression/expression.rs
@@ -12,7 +12,7 @@ use crate::{
     GroupType,
     Integer,
 };
-use leo_types::{Expression, Type};
+use leo_typed::{Expression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/function/function.rs b/compiler/src/expression/function/function.rs
index 1fa9c50797..03f54b0921 100644
--- a/compiler/src/expression/function/function.rs
+++ b/compiler/src/expression/function/function.rs
@@ -1,7 +1,7 @@
 //! Enforce a function call expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, Span, Type};
+use leo_typed::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/identifier/identifier.rs b/compiler/src/expression/identifier/identifier.rs
index 4b35ccb05a..23cb40dd25 100644
--- a/compiler/src/expression/identifier/identifier.rs
+++ b/compiler/src/expression/identifier/identifier.rs
@@ -7,7 +7,7 @@ use crate::{
     Address,
     GroupType,
 };
-use leo_types::{Identifier, Type};
+use leo_typed::{Identifier, Type};
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/expression/logical/and.rs b/compiler/src/expression/logical/and.rs
index db35ed1b5e..ee80c1ba1b 100644
--- a/compiler/src/expression/logical/and.rs
+++ b/compiler/src/expression/logical/and.rs
@@ -1,7 +1,7 @@
 //! Enforces a logical `&&` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/logical/not.rs b/compiler/src/expression/logical/not.rs
index 8eaede90e8..9e1d63b230 100644
--- a/compiler/src/expression/logical/not.rs
+++ b/compiler/src/expression/logical/not.rs
@@ -1,7 +1,7 @@
 //! Enforces a logical `!` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/expression/logical/or.rs b/compiler/src/expression/logical/or.rs
index a4f900adf6..454ba1be25 100644
--- a/compiler/src/expression/logical/or.rs
+++ b/compiler/src/expression/logical/or.rs
@@ -1,7 +1,7 @@
 //! Enforces a logical `||` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/relational/eq.rs b/compiler/src/expression/relational/eq.rs
index 766544556f..6f62542001 100644
--- a/compiler/src/expression/relational/eq.rs
+++ b/compiler/src/expression/relational/eq.rs
@@ -1,7 +1,7 @@
 //! Enforces a relational `==` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/relational/ge.rs b/compiler/src/expression/relational/ge.rs
index c8c7737f93..a91cc8d3bc 100644
--- a/compiler/src/expression/relational/ge.rs
+++ b/compiler/src/expression/relational/ge.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
 use leo_gadgets::bits::ComparatorGadget;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/relational/gt.rs b/compiler/src/expression/relational/gt.rs
index 96ad587219..4fc26cbe20 100644
--- a/compiler/src/expression/relational/gt.rs
+++ b/compiler/src/expression/relational/gt.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
 use leo_gadgets::bits::ComparatorGadget;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/relational/le.rs b/compiler/src/expression/relational/le.rs
index 77574e051f..06f8d47294 100644
--- a/compiler/src/expression/relational/le.rs
+++ b/compiler/src/expression/relational/le.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
 use leo_gadgets::bits::ComparatorGadget;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/expression/relational/lt.rs b/compiler/src/expression/relational/lt.rs
index a5ff4e5222..4c49c36bd1 100644
--- a/compiler/src/expression/relational/lt.rs
+++ b/compiler/src/expression/relational/lt.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
 use leo_gadgets::bits::comparator::EvaluateLtGadget;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/function.rs b/compiler/src/function/function.rs
index 95876b0016..c2988813de 100644
--- a/compiler/src/function/function.rs
+++ b/compiler/src/function/function.rs
@@ -7,7 +7,7 @@ use crate::{
     GroupType,
 };
 
-use leo_types::{Expression, Function, Span};
+use leo_typed::{Expression, Function, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/input/array.rs b/compiler/src/function/input/array.rs
index 8f2aa19e94..10e81d68f0 100644
--- a/compiler/src/function/input/array.rs
+++ b/compiler/src/function/input/array.rs
@@ -8,7 +8,7 @@ use crate::{
     GroupType,
 };
 
-use leo_types::{InputValue, Span, Type};
+use leo_typed::{InputValue, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/input/input.rs b/compiler/src/function/input/input.rs
index 5dfd816c3a..e455ecee31 100644
--- a/compiler/src/function/input/input.rs
+++ b/compiler/src/function/input/input.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::FunctionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
 
-use leo_types::{Expression, Type};
+use leo_typed::{Expression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/input/main_input.rs b/compiler/src/function/input/main_input.rs
index ab619dba96..b80c0ee2ce 100644
--- a/compiler/src/function/input/main_input.rs
+++ b/compiler/src/function/input/main_input.rs
@@ -14,7 +14,7 @@ use crate::{
     Integer,
 };
 
-use leo_types::{InputValue, Span, Type};
+use leo_typed::{InputValue, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/main_function.rs b/compiler/src/function/main_function.rs
index cb044fc238..6991a9cd94 100644
--- a/compiler/src/function/main_function.rs
+++ b/compiler/src/function/main_function.rs
@@ -8,7 +8,7 @@ use crate::{
     GroupType,
 };
 
-use leo_types::{Expression, Function, InputValue};
+use leo_typed::{Expression, Function, InputValue};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/function/result/result.rs b/compiler/src/function/result/result.rs
index 0107654a52..49fc830cfa 100644
--- a/compiler/src/function/result/result.rs
+++ b/compiler/src/function/result/result.rs
@@ -2,7 +2,7 @@
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
 
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/import/parser/import_parser.rs b/compiler/src/import/parser/import_parser.rs
index 4825da4eac..9a9234f2bb 100644
--- a/compiler/src/import/parser/import_parser.rs
+++ b/compiler/src/import/parser/import_parser.rs
@@ -1,5 +1,5 @@
 use crate::errors::ImportError;
-use leo_types::Program;
+use leo_typed::Program;
 
 use std::{collections::HashMap, env::current_dir};
 
diff --git a/compiler/src/import/parser/parse_package.rs b/compiler/src/import/parser/parse_package.rs
index c0f78000ef..0a149b1adb 100644
--- a/compiler/src/import/parser/parse_package.rs
+++ b/compiler/src/import/parser/parse_package.rs
@@ -1,5 +1,5 @@
 use crate::{errors::ImportError, ImportParser};
-use leo_types::{Package, PackageAccess};
+use leo_typed::{Package, PackageAccess};
 
 use std::{fs, fs::DirEntry, path::PathBuf};
 
diff --git a/compiler/src/import/parser/parse_symbol.rs b/compiler/src/import/parser/parse_symbol.rs
index 9e4c899917..fc6884415e 100644
--- a/compiler/src/import/parser/parse_symbol.rs
+++ b/compiler/src/import/parser/parse_symbol.rs
@@ -1,6 +1,6 @@
 use crate::{errors::ImportError, ImportParser};
 use leo_ast::LeoAst;
-use leo_types::{ImportSymbol, Program, Span};
+use leo_typed::{ImportSymbol, Program, Span};
 
 use std::{ffi::OsString, fs::DirEntry, path::PathBuf};
 
diff --git a/compiler/src/import/store/import.rs b/compiler/src/import/store/import.rs
index 2acf551772..c13454f3be 100644
--- a/compiler/src/import/store/import.rs
+++ b/compiler/src/import/store/import.rs
@@ -1,5 +1,5 @@
 use crate::{errors::ImportError, imported_symbols::ImportedSymbols, ConstrainedProgram, GroupType, ImportParser};
-use leo_types::Import;
+use leo_typed::Import;
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/import/store/imported_symbols.rs b/compiler/src/import/store/imported_symbols.rs
index d9fd56e888..71e915a35b 100644
--- a/compiler/src/import/store/imported_symbols.rs
+++ b/compiler/src/import/store/imported_symbols.rs
@@ -1,4 +1,4 @@
-use leo_types::{Import, ImportSymbol, Package, PackageAccess};
+use leo_typed::{Import, ImportSymbol, Package, PackageAccess};
 
 /// Stores the the package file name and imported symbol from an import statement
 #[derive(Debug)]
diff --git a/compiler/src/import/store/symbol.rs b/compiler/src/import/store/symbol.rs
index 5fd7366ddc..c618c6f6b5 100644
--- a/compiler/src/import/store/symbol.rs
+++ b/compiler/src/import/store/symbol.rs
@@ -1,5 +1,5 @@
 use crate::{errors::ImportError, new_scope, ConstrainedProgram, ConstrainedValue, GroupType};
-use leo_types::{ImportSymbol, Program};
+use leo_typed::{ImportSymbol, Program};
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/macro_/format.rs b/compiler/src/macro_/format.rs
index cc872f5b57..4eaf449507 100644
--- a/compiler/src/macro_/format.rs
+++ b/compiler/src/macro_/format.rs
@@ -1,7 +1,7 @@
 //! Evaluates a formatted string in a compiled Leo program.
 
 use crate::{errors::MacroError, program::ConstrainedProgram, GroupType};
-use leo_types::FormattedString;
+use leo_typed::FormattedString;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/macro_/macro_.rs b/compiler/src/macro_/macro_.rs
index 9ab6efe503..84e406b802 100644
--- a/compiler/src/macro_/macro_.rs
+++ b/compiler/src/macro_/macro_.rs
@@ -1,7 +1,7 @@
 //! Evaluates a macro in a compiled Leo program.
 
 use crate::{errors::MacroError, program::ConstrainedProgram, GroupType};
-use leo_types::{FormattedMacro, MacroName};
+use leo_typed::{FormattedMacro, MacroName};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/assert/assert_eq.rs b/compiler/src/statement/assert/assert_eq.rs
index abe64b2a45..b7633e2289 100644
--- a/compiler/src/statement/assert/assert_eq.rs
+++ b/compiler/src/statement/assert/assert_eq.rs
@@ -1,7 +1,7 @@
 //! Enforces an assert equals statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/assign/array.rs b/compiler/src/statement/assign/array.rs
index cf9706a2d7..f27b89c941 100644
--- a/compiler/src/statement/assign/array.rs
+++ b/compiler/src/statement/assign/array.rs
@@ -1,7 +1,7 @@
 //! Enforces an array assignment statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{RangeOrExpression, Span};
+use leo_typed::{RangeOrExpression, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/assign/assign.rs b/compiler/src/statement/assign/assign.rs
index 693bb8f4b8..c1dfbdcdcd 100644
--- a/compiler/src/statement/assign/assign.rs
+++ b/compiler/src/statement/assign/assign.rs
@@ -7,7 +7,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_types::{Assignee, Expression, Span};
+use leo_typed::{Assignee, Expression, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/assign/assignee.rs b/compiler/src/statement/assign/assignee.rs
index 32a3357aeb..ae3a864369 100644
--- a/compiler/src/statement/assign/assignee.rs
+++ b/compiler/src/statement/assign/assignee.rs
@@ -1,7 +1,7 @@
 //! Resolves assignees in a compiled Leo program.
 
 use crate::{errors::StatementError, new_scope, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Assignee, Span};
+use leo_typed::{Assignee, Span};
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/statement/assign/circuit_field.rs b/compiler/src/statement/assign/circuit_field.rs
index a7a7ddc363..450bfa7816 100644
--- a/compiler/src/statement/assign/circuit_field.rs
+++ b/compiler/src/statement/assign/circuit_field.rs
@@ -1,7 +1,7 @@
 //! Enforces a circuit field assignment statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Identifier, Span};
+use leo_typed::{Identifier, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/branch/branch.rs b/compiler/src/statement/branch/branch.rs
index cf8e3a0cd8..6c954c0e15 100644
--- a/compiler/src/statement/branch/branch.rs
+++ b/compiler/src/statement/branch/branch.rs
@@ -1,7 +1,7 @@
 //! Enforces a branch of a conditional or iteration statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Statement, Type};
+use leo_typed::{Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/conditional/conditional.rs b/compiler/src/statement/conditional/conditional.rs
index 2e0cbab9d2..a88ec0ffdd 100644
--- a/compiler/src/statement/conditional/conditional.rs
+++ b/compiler/src/statement/conditional/conditional.rs
@@ -1,7 +1,7 @@
 //! Methods to enforce constraints on statements in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{ConditionalNestedOrEndStatement, ConditionalStatement, Span, Type};
+use leo_typed::{ConditionalNestedOrEndStatement, ConditionalStatement, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/definition/definition.rs b/compiler/src/statement/definition/definition.rs
index 7c65c40ba1..59f307a8fc 100644
--- a/compiler/src/statement/definition/definition.rs
+++ b/compiler/src/statement/definition/definition.rs
@@ -1,7 +1,7 @@
 //! Enforces a definition statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, GroupType};
-use leo_types::{Declare, Expression, Span, Variable};
+use leo_typed::{Declare, Expression, Span, Variable};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/definition/multiple.rs b/compiler/src/statement/definition/multiple.rs
index ba37fc33ab..df0a98a86f 100644
--- a/compiler/src/statement/definition/multiple.rs
+++ b/compiler/src/statement/definition/multiple.rs
@@ -1,7 +1,7 @@
 //! Enforces a multiple definition statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Expression, Span, Variable};
+use leo_typed::{Expression, Span, Variable};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/iteration/iteration.rs b/compiler/src/statement/iteration/iteration.rs
index b221b4db02..89e20cb19b 100644
--- a/compiler/src/statement/iteration/iteration.rs
+++ b/compiler/src/statement/iteration/iteration.rs
@@ -8,7 +8,7 @@ use crate::{
     GroupType,
     Integer,
 };
-use leo_types::{Expression, Identifier, Span, Statement, Type};
+use leo_typed::{Expression, Identifier, Span, Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/return_/return_.rs b/compiler/src/statement/return_/return_.rs
index 668caa52f2..f78dc51b70 100644
--- a/compiler/src/statement/return_/return_.rs
+++ b/compiler/src/statement/return_/return_.rs
@@ -6,7 +6,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_types::{Expression, Span, Type};
+use leo_typed::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/statement/statement.rs b/compiler/src/statement/statement.rs
index c8cb1fc3ab..c16c5e659a 100644
--- a/compiler/src/statement/statement.rs
+++ b/compiler/src/statement/statement.rs
@@ -1,7 +1,7 @@
 //! Enforces a statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_types::{Statement, Type};
+use leo_typed::{Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},
diff --git a/compiler/src/value/address/address.rs b/compiler/src/value/address/address.rs
index 083c2c7c9a..da143bcaba 100644
--- a/compiler/src/value/address/address.rs
+++ b/compiler/src/value/address/address.rs
@@ -1,5 +1,5 @@
 use crate::{errors::AddressError, ConstrainedValue, GroupType};
-use leo_types::{InputValue, Span};
+use leo_typed::{InputValue, Span};
 
 use snarkos_dpc::base_dpc::instantiated::Components;
 use snarkos_errors::gadgets::SynthesisError;
diff --git a/compiler/src/value/boolean/input.rs b/compiler/src/value/boolean/input.rs
index 523fed643d..50e41cc244 100644
--- a/compiler/src/value/boolean/input.rs
+++ b/compiler/src/value/boolean/input.rs
@@ -1,7 +1,7 @@
 //! Methods to enforce constraints on input boolean values in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_types::{InputValue, Span};
+use leo_typed::{InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/value/field/field_type.rs b/compiler/src/value/field/field_type.rs
index 3ec5afce4b..fd81ce10f7 100644
--- a/compiler/src/value/field/field_type.rs
+++ b/compiler/src/value/field/field_type.rs
@@ -1,7 +1,7 @@
 //! A data type that represents a field value
 
 use crate::errors::FieldError;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/value/field/input.rs b/compiler/src/value/field/input.rs
index 85b937f4c6..b01044ef0f 100644
--- a/compiler/src/value/field/input.rs
+++ b/compiler/src/value/field/input.rs
@@ -1,7 +1,7 @@
 //! Methods to enforce constraints on input field values in a compiled Leo program.
 
 use crate::{errors::FieldError, value::ConstrainedValue, FieldType, GroupType};
-use leo_types::{InputValue, Span};
+use leo_typed::{InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/value/group/group_type.rs b/compiler/src/value/group/group_type.rs
index 7b510ab55f..89c0d7c6b8 100644
--- a/compiler/src/value/group/group_type.rs
+++ b/compiler/src/value/group/group_type.rs
@@ -1,7 +1,7 @@
 //! A data type that represents members in the group formed by the set of affine points on a curve.
 
 use crate::errors::GroupError;
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, One},
diff --git a/compiler/src/value/group/input.rs b/compiler/src/value/group/input.rs
index 72733b1840..4f0e44017f 100644
--- a/compiler/src/value/group/input.rs
+++ b/compiler/src/value/group/input.rs
@@ -1,7 +1,7 @@
 //! Methods to enforce constraints on input group values in a Leo program.
 
 use crate::{errors::GroupError, ConstrainedValue, GroupType};
-use leo_types::{InputValue, Span};
+use leo_typed::{InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/value/group/targets/edwards_bls12.rs b/compiler/src/value/group/targets/edwards_bls12.rs
index a575c2a926..02210be4c4 100644
--- a/compiler/src/value/group/targets/edwards_bls12.rs
+++ b/compiler/src/value/group/targets/edwards_bls12.rs
@@ -1,5 +1,5 @@
 use crate::{errors::GroupError, GroupType};
-use leo_types::Span;
+use leo_typed::Span;
 
 use snarkos_curves::{
     edwards_bls12::{EdwardsAffine, EdwardsParameters, Fq},
diff --git a/compiler/src/value/implicit/implicit.rs b/compiler/src/value/implicit/implicit.rs
index b626d85e93..93c9107c4e 100644
--- a/compiler/src/value/implicit/implicit.rs
+++ b/compiler/src/value/implicit/implicit.rs
@@ -1,7 +1,7 @@
 //! Enforces constraints on an implicit number in a compiled Leo program.
 
 use crate::{errors::ValueError, value::ConstrainedValue, GroupType};
-use leo_types::{Span, Type};
+use leo_typed::{Span, Type};
 
 use snarkos_models::curves::{Field, PrimeField};
 
diff --git a/compiler/src/value/integer/integer.rs b/compiler/src/value/integer/integer.rs
index 9c3c6bf715..2c53b15f43 100644
--- a/compiler/src/value/integer/integer.rs
+++ b/compiler/src/value/integer/integer.rs
@@ -5,7 +5,7 @@ use leo_gadgets::{
     bits::comparator::{ComparatorGadget, EvaluateLtGadget},
     signed_integer::*,
 };
-use leo_types::{InputValue, IntegerType, Span};
+use leo_typed::{InputValue, IntegerType, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/src/value/value.rs b/compiler/src/value/value.rs
index 645a008bd8..a7753ca220 100644
--- a/compiler/src/value/value.rs
+++ b/compiler/src/value/value.rs
@@ -10,7 +10,7 @@ use crate::{
     GroupType,
     Integer,
 };
-use leo_types::{Circuit, Function, Identifier, Span, Type};
+use leo_typed::{Circuit, Function, Identifier, Span, Type};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{
diff --git a/compiler/tests/address/mod.rs b/compiler/tests/address/mod.rs
index 34b9a67e64..bbc9b937f9 100644
--- a/compiler/tests/address/mod.rs
+++ b/compiler/tests/address/mod.rs
@@ -7,7 +7,7 @@ use crate::{
     EdwardsTestCompiler,
 };
 use leo_compiler::{Address, ConstrainedValue};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_dpc::base_dpc::instantiated::Components;
 use snarkos_objects::AccountAddress;
diff --git a/compiler/tests/array/mod.rs b/compiler/tests/array/mod.rs
index 94886b1527..1d97cfa456 100644
--- a/compiler/tests/array/mod.rs
+++ b/compiler/tests/array/mod.rs
@@ -12,7 +12,7 @@ use leo_compiler::{
     Integer,
 };
 use leo_inputs::types::{IntegerType, U32Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_models::gadgets::utilities::uint::UInt32;
 
diff --git a/compiler/tests/boolean/mod.rs b/compiler/tests/boolean/mod.rs
index fc849e6008..828e10f462 100644
--- a/compiler/tests/boolean/mod.rs
+++ b/compiler/tests/boolean/mod.rs
@@ -3,7 +3,7 @@ use leo_compiler::{
     errors::{BooleanError, CompilerError, ExpressionError, FunctionError, StatementError},
     ConstrainedValue,
 };
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_models::gadgets::utilities::boolean::Boolean;
 
diff --git a/compiler/tests/circuits/mod.rs b/compiler/tests/circuits/mod.rs
index 46784d01e4..326abb929e 100644
--- a/compiler/tests/circuits/mod.rs
+++ b/compiler/tests/circuits/mod.rs
@@ -12,7 +12,7 @@ use leo_compiler::{
     ConstrainedValue,
     Integer,
 };
-use leo_types::{Expression, Function, Identifier, Span, Statement, Type};
+use leo_typed::{Expression, Function, Identifier, Span, Statement, Type};
 
 use snarkos_models::gadgets::utilities::uint::UInt32;
 
diff --git a/compiler/tests/field/mod.rs b/compiler/tests/field/mod.rs
index 456badc56b..555c68ebf6 100644
--- a/compiler/tests/field/mod.rs
+++ b/compiler/tests/field/mod.rs
@@ -11,7 +11,7 @@ use leo_compiler::{
     ConstrainedValue,
     FieldType,
 };
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use num_bigint::BigUint;
 use rand::{Rng, SeedableRng};
diff --git a/compiler/tests/group/mod.rs b/compiler/tests/group/mod.rs
index ea056fed13..03bc9967ea 100644
--- a/compiler/tests/group/mod.rs
+++ b/compiler/tests/group/mod.rs
@@ -7,7 +7,7 @@ use crate::{
     EdwardsTestCompiler,
 };
 use leo_compiler::{group::targets::edwards_bls12::EdwardsGroupType, ConstrainedValue};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::{EdwardsAffine, EdwardsParameters, Fq};
 use snarkos_gadgets::curves::edwards_bls12::EdwardsBlsGadget;
diff --git a/compiler/tests/integers/i128/mod.rs b/compiler/tests/integers/i128/mod.rs
index 6b9f332e3e..7223476ec5 100644
--- a/compiler/tests/integers/i128/mod.rs
+++ b/compiler/tests/integers/i128/mod.rs
@@ -10,7 +10,7 @@ use crate::{
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_gadgets::*;
 use leo_inputs::types::{I128Type, IntegerType};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget};
diff --git a/compiler/tests/integers/i16/mod.rs b/compiler/tests/integers/i16/mod.rs
index bddaeb84be..00b8af21fa 100644
--- a/compiler/tests/integers/i16/mod.rs
+++ b/compiler/tests/integers/i16/mod.rs
@@ -10,7 +10,7 @@ use crate::{
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_gadgets::*;
 use leo_inputs::types::{I16Type, IntegerType};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget};
diff --git a/compiler/tests/integers/i32/mod.rs b/compiler/tests/integers/i32/mod.rs
index 940379ad8d..2dadf81a9a 100644
--- a/compiler/tests/integers/i32/mod.rs
+++ b/compiler/tests/integers/i32/mod.rs
@@ -10,7 +10,7 @@ use crate::{
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_gadgets::*;
 use leo_inputs::types::{I32Type, IntegerType};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget};
diff --git a/compiler/tests/integers/i64/mod.rs b/compiler/tests/integers/i64/mod.rs
index e0774f4a85..5b6af1772c 100644
--- a/compiler/tests/integers/i64/mod.rs
+++ b/compiler/tests/integers/i64/mod.rs
@@ -10,7 +10,7 @@ use crate::{
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_gadgets::*;
 use leo_inputs::types::{I64Type, IntegerType};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget};
diff --git a/compiler/tests/integers/i8/mod.rs b/compiler/tests/integers/i8/mod.rs
index 94c1dde76a..69ce94b8a6 100644
--- a/compiler/tests/integers/i8/mod.rs
+++ b/compiler/tests/integers/i8/mod.rs
@@ -10,7 +10,7 @@ use crate::{
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_gadgets::*;
 use leo_inputs::types::{I8Type, IntegerType};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget};
diff --git a/compiler/tests/integers/u128/mod.rs b/compiler/tests/integers/u128/mod.rs
index e1a8470c60..dd7b7b4f1c 100644
--- a/compiler/tests/integers/u128/mod.rs
+++ b/compiler/tests/integers/u128/mod.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_inputs::types::{IntegerType, U128Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{
diff --git a/compiler/tests/integers/u16/mod.rs b/compiler/tests/integers/u16/mod.rs
index 15534974e3..be87fffbdb 100644
--- a/compiler/tests/integers/u16/mod.rs
+++ b/compiler/tests/integers/u16/mod.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_inputs::types::{IntegerType, U16Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{
diff --git a/compiler/tests/integers/u32/mod.rs b/compiler/tests/integers/u32/mod.rs
index ce5cf6f951..4039c9b645 100644
--- a/compiler/tests/integers/u32/mod.rs
+++ b/compiler/tests/integers/u32/mod.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_inputs::types::{IntegerType, U32Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{
diff --git a/compiler/tests/integers/u64/mod.rs b/compiler/tests/integers/u64/mod.rs
index 924079e1c5..2ea3077dd3 100644
--- a/compiler/tests/integers/u64/mod.rs
+++ b/compiler/tests/integers/u64/mod.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_inputs::types::{IntegerType, U64Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{
diff --git a/compiler/tests/integers/u8/mod.rs b/compiler/tests/integers/u8/mod.rs
index f872a6c3b9..a024ff580b 100644
--- a/compiler/tests/integers/u8/mod.rs
+++ b/compiler/tests/integers/u8/mod.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use leo_compiler::{ConstrainedValue, Integer};
 use leo_inputs::types::{IntegerType, U8Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::{
diff --git a/compiler/tests/macros/mod.rs b/compiler/tests/macros/mod.rs
index 7d14bfebdf..ca8b766247 100644
--- a/compiler/tests/macros/mod.rs
+++ b/compiler/tests/macros/mod.rs
@@ -1,5 +1,5 @@
 use crate::{get_error, get_output, parse_program};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 #[test]
 fn test_print() {
diff --git a/compiler/tests/statements/conditional/mod.rs b/compiler/tests/statements/conditional/mod.rs
index b9e8f959ae..d09022829e 100644
--- a/compiler/tests/statements/conditional/mod.rs
+++ b/compiler/tests/statements/conditional/mod.rs
@@ -6,7 +6,7 @@ use crate::{
     EdwardsTestCompiler,
 };
 use leo_inputs::types::{IntegerType, U32Type};
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::r1cs::TestConstraintSystem;
diff --git a/compiler/tests/statements/mod.rs b/compiler/tests/statements/mod.rs
index 2d59beaa39..9ef4eec43b 100644
--- a/compiler/tests/statements/mod.rs
+++ b/compiler/tests/statements/mod.rs
@@ -3,7 +3,7 @@ use crate::{
     integers::u32::{output_one, output_zero},
     parse_program,
 };
-use leo_types::InputValue;
+use leo_typed::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_models::gadgets::r1cs::TestConstraintSystem;