Renaming stuff + xbox fixes, broke a lot of stuff