Update SwingFish for new naming conventions
Merge pull request #1610 from Cottser/swingfish

Update SwingFish for new naming conventions