Names tweaks.

Small tweaks to the files and variable names.