Some documenting and naming fixing.