Little rename of database structure and nice helper