added safenames for modfiles (avoid collision with builtin nrn), cleaned up