Deprecated adapter to handle rename, testing helpers moved up one package.