rename surface classes