Various resolution and naming improvement.