[greg and jashaad] "renamed classes"