Rename variables to underscore, normalize,  use timespec converstion macro