Name changes and test rework