consistency fix, global renaming