Namespace for whole wrapper and some renaming.