More renaming and sanitization