Renamed CVS specific bean names to genral names