Rethink lockstate variable names