Minor fixes around position and naming.