classes renamed accordingly