I knew I should have abstracted this from the start
At least I can just use search and replace