Update and rename World to WORLD