Name path variables *_path

@charlierudolph some small cleanup and better variable naming