minor renames, Ltg beautification.