Change to namespace variables correctly