Fix failing specs due to namespace change