renamed classes to underscore patterns