Using system mapping to rename some old names
Fixing YFM