Update GrandPerspective for new naming conventions
Merge pull request #1566 from Cottser/grandperspective

Update GrandPerspective for new naming conventions