Rename lng->lon and add new property location