updates from chapter work
pipetype casing unification