Probably, but I wasn't sure if you wanted me to change directly or if you wanted additional comments (for the latter one, I can't help much, except saying your arguments seem valid)
So I rename all CF-7000 to CF-Series?