That's still the default in my localhost, but I get a warning that it'll change.

You can set it in the config to whatever you want and the warning goes away.

The whole default branch name change was a terrible idea that caused many more problems than it solved—as was already pointed out at the time.

But if you're going to set a name anyway, may as well call it trunk, or dominatrix, depending upon today's silliness level.