[Fix] Class Names according to Warden 2.0