correctly name surface classes