Fix scaling tests failing due to a name clash