refactored use of ship names to use constants