more renaming to fixb