Rename to include processor architecture