Fix name collision
2.5.2