Changed parameter name regex support to something that works