shorted a few pin names to something more reasonable