REP-18: Changed path names slightly to be more consistent with other install locations.