OK. I won't mind to leave it as is and don't rename.
If it is only one concern here, I'll push the fix soon.