Phone: Updated namespace for Mapping samples