Renaming internals