Tweak property names, clean up api