Name changes and explode fix