Some renaming end reorganization in fixtures