Fix name collision in previous commit