Removed deprecated classes and renamed one to X field