[test] Names changes and cosmetics