Fixed const nameclash