removed typing info from name
Removing '-' from tokenchars to better fit Z3
Semi-working translation to z3 (still need queries)