File renames and function variables more consist.

File names have been renamed to be more friendly. Functions and
variables more consistent.