You are very correct

I was wondering why the campus of Peking U was called Yan Yuan in my early days there. Gradually, I know the history of Peking U and  燕京 U a little bit better. In the campus of Peking U, you can find a lot things about 燕京 U. 

I am not familiar with Shanghai. Hope some day, I can spend some times there to learn.