refactoring imports
fixed naming inconsistency with ' and * in the Circuit and Simulation (eval) definition