renamed all class for clearer distinction