Minor pinnaming changes