Go back to common property names to allow multi instances of test cases.