slight renamings
slight renamings
tidied code but found a test failure
actually the code was fine, the test was wrong