Ups. Fix name clash