Renames and tweaks to FDC