Renaming components so it matches the spec arch naming.
Organizing recovered diagram so it looks nice.