[misc] Aligned classess to their XWiki 5.0 equivalent