Fix namespace violation