revert again mfc firmware renaming (for now)
pretty it up for 4.2.1.0