More work on tidying and standardising naming of things.