rename things a bit more semantically for sanity's sake