Fixed address template and changed case