clock: clean up naming