updated class file names to fix bug