manually updated FG naming to CM or no prefix