Fix namespacing issues in the clock.