Fixed java files back to conventional names.