Some renaming and tidying.