Database

More database structure/name changes