renaming with correct namespace