Rework pin-naming schema, further clarifies #1