Renamed Clock and ICore classes to match naming conventions