Rename fmd

Deleting the TODOs as most are already covered by existing issues.