Close #11 : This does, indeed, fix the big janky naming bug