Fixed up Ed Markey

Originally an issue with the steps, several "name" values were entirely wrong and made an overall cleanup.