Fix clashing names and test the helpers