Relocate helpers, change string for regex