They should have been changed a long time ago. I know it's a big commit but I think it needs to be done sooner or later, and thats what people have been saying since 1.13 release.