Fixed side-effects of recent renaming