Remake of DB and seeder with correct naming