Thanks for your feedback!

Indeed, I will plan to amend schema to follow convention in one of closest chapters,