Name change - fix tests