Fix doc and names