more internal renames