renamed class names to prevent duplicates
fixing incorrect declaration of "sunk" fields
Merge remote-tracking branch 'origin/master'