Fix import variable references