Fix missing `_` prefix on some utils files!