More modifications to Clock, including renaming