[TASK] Remove underscore