cleaning-up renamed strings