Renamed files/routines to be more compatible with other efforts.