-location ~* "^/layer/<%= @name %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
- fastcgi_param QUERY_STRING "map=/srv/imagery/<%= @name %>.map&mode=tile&layers=<%= @name %>&tilemode=gmap&tile=$2+$3+$1";
- fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket";
+location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
+ # Override QUERY_STRING to force mapserver query parameters
+ fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
+ fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @layer %>.socket";