Refine links
Fix description
Rename some factories