fix namespace collision, add variable to CF