Refactored naming of clock