Bug fixing

Wrong naming of imported variables.
Wrong abvm file re pattern.