Changed state names