Renamed more stuff (will break app_die(), so it needs fixing).