Enhanced Hardware Support - Finalize Naming

This feature request will provide the final naming of the next machine