Name changes
More changes
More changes
One more set of naming changes
Closes #473
Merge branch 'master' into portCaching