More commits for renaming content-hub
requested to merge personal/peat-psuwit/mariogiprename-plus into personal/mariogrip/focal_-_lomiri-rename
These commits address most issues raised in !2 (merged). The MR is made against !2 (merged) so that @mariogrip can decide if he wants these or not.
Edited by Ratchanan Srirattanamet