renaming fixtures to be consistent.