Rename & Several Updates