consistent ship naming