Change the names from factory to transform