Modified table names and database name to work with CAKEPHP