Rename complete.
Made the basic changes.