Updates to website after various renaming