Move custom strings to CM strings