Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
A few extra renames for classes which were missed in last week's PRs.