Fix Problems with Namescopes