Changed name of filters, from parametric/non-parametric to linear/non-linear