[Misc] Improve name and description