Changed table names

To prevent collision with other projects using cbpp_apps database. Will
upload revised .sql dump tomorrow