Change more 'database group' to 'dbgroup'