What's the difference between decoupling capacitor and bypass capacitor?

I agree but will add the following:

Sometimes bypass refers specifically to "high frequency bypass" as in a low value ceramic. Usually you will have to read the context in which the terms are used.