Adjusted a few variable and theme names.