Changed naming and some descriptions, links