Renaming the internals