Update SecondBar for new naming conventions
Merge pull request #1601 from Cottser/secondbar

Update SecondBar for new naming conventions