Prevent naming collision; bug fix.