Added scene swapping and name swapping