renamed classes to begin with capital letter