Remove underscore. CR changes.