Clear up naming around zero address