Added links and clarified terminology.
Renaming to reflect the correct terminology.