Tweak function names a bit and update readme