renamed classes to match pattern