Renaming nfe to MD
Cleanup
Use correct class