Changed names and edited content for website