Changed some view names