fixes for integration test compile in online IDE (had renamed files inconsistently.)