Change numerical code for defined constant
Set variables defending on the presence of the __ONE_MINUTE__ define.
Update for class package change.