Trip Discovery: CompleteLongWordNamingConventions

Classes renamed to match naming convention of using complete long words.