adjust namespace and rename