Modified the naming scheme for hardware tables.