Refactor the terribly confusing hopper piston naming scheme.