Updates. Updates everywhere!
-Everything should work now after the renames.