Naming- and Namespace adaptions