* VerificationCircuit --> NIFSVerifierCircuit, for clarity * InnerCircuit --> StepCircuit * Rename * cleanup imports * additional cleanup in the test * small cleanup