Bit of renaming and tidying up.