More tidy up, renames and doco