Changed Spoke ID for naming convention