cleaning up the fixtures a bit, removing some of the names and making them more generic