Update admin_fields block, rename admin blocks