Update and rename halo to Halo