renaming cli classes since bean xml already had new names