Fixed samples after namespace changes