Fixed java files to match consolidation of databases