correct regex, switch parameters, add full class names