Sample renames

@markewallace - Hi Mark. Here the renamed samples and amended unit tests. I ran the GridsTestSuite, BaseTestSuite and ControlsTestSuite - they all run fine.