Yea, I think just that filename / classname rename will make this good.