Halt rename of classes: resolve a conflict