model propertyt name fix, address pattern fix