0916-0942

Renamed a couple of files

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>