Fix naming tests break