renamed classes to convention