ENH: Renaming and conditional testing.