Unlike their name suggests, they are not the same thing, or even related really. Astronomers don't really think when they name things some time :p They are "dark" simply because we cannot see them!
Dark energy, in a nutshell, is the force that is opposite of gravity. It's just a force. Gravity pulls, dark energy pushes. It is the force of expansion in a few words. It is the reason the universe is expanding and will continue to expand to no end, as I outlined above!
Dark matter you pretty had spot on. It is matter we cannot see, but are aware it's there due to the math and gravitational lensing. It does make up a LARGE portion of the universe's matter, around 17/20th. So they are not really related, with the exception that we cannot see them. They are "dark".
Astro-physicists have tried to tie dark matter to the universe's expansion but I have never seen the relation clearly, it is matter so it would have properties of gravity, not repulsion. Either way, they are both real cool stuff!
And thanks sack (: