better names for some classes