renaming and time-domain code cleanup