Tweak name and add description