Updated names and did quick changes to content.