Changing the naming for the rest