I didn't want to repeat myself in case sb wanted to rename the classes. Though that's not sth that will be done frequently so you're right; I'll change it.