Updating spacing and naming