hardware: Slight reorganization for more consistent naming.