YH-347: Spatial resource naming patch