Updated file naming. Setting the stage to reduce redundancies with Ian Hill's theme.