Adjust namespace and a little more