Move to consistent naming
doc fix, pull out magic strings, better test.html