Core/Scripts: Unify Chrono Literals (#22420)

* Unify Chrono Literals

* Retire IN_MILLISECONDS

* Build fix

* Build fix (sequel)

* Retire urand()

* Edge cases

* Build

* Whitespaces

* More edge cases

* Additional cases

47 files changed, 417 insertions, 417 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index c93a47b243b..243b0054f1f 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -110,9 +110,9 @@ class boss_nexusprince_shaffar : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_BEACON, 10000);
-                events.ScheduleEvent(EVENT_FIREBALL, 8000);
-                events.ScheduleEvent(EVENT_FROSTBOLT, 4000);
+                events.ScheduleEvent(EVENT_BEACON, 10s);
+                events.ScheduleEvent(EVENT_FIREBALL, 8s);
+                events.ScheduleEvent(EVENT_FROSTBOLT, 4s);
                 events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
             }
 
@@ -160,20 +160,20 @@ class boss_nexusprince_shaffar : public CreatureScript
                             Talk(SAY_SUMMON);
 
                         DoCast(me, SPELL_ETHEREAL_BEACON, true);
-                        events.ScheduleEvent(EVENT_BEACON, 10000);
+                        events.ScheduleEvent(EVENT_BEACON, 10s);
                         break;
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(4500, 6000));
+                        events.ScheduleEvent(EVENT_FIREBALL, 4500ms, 6s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, urand(4500, 6000));
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 4500ms, 6s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCast(me, SPELL_FROSTNOVA);
                         events.ScheduleEvent(EVENT_FROST_NOVA, urand(17500, 25000));
-                        events.ScheduleEvent(EVENT_BLINK, 1500);
+                        events.ScheduleEvent(EVENT_BLINK, 1500ms);
                         break;
                     default:
                         break;
@@ -217,7 +217,7 @@ class npc_ethereal_beacon : public CreatureScript
                         shaffar->AI()->AttackStart(who);
 
                 _events.ScheduleEvent(EVENT_APPRENTICE, DUNGEON_MODE(20000, 10000));
-                _events.ScheduleEvent(EVENT_ARCANE_BOLT, 1000);
+                _events.ScheduleEvent(EVENT_ARCANE_BOLT, 1s);
             }
 
             void JustSummoned(Creature* summoned) override
@@ -245,7 +245,7 @@ class npc_ethereal_beacon : public CreatureScript
                             break;
                         case EVENT_ARCANE_BOLT:
                             DoCastVictim(SPELL_ARCANE_BOLT);
-                            _events.ScheduleEvent(EVENT_ARCANE_BOLT, urand(2000, 4500));
+                            _events.ScheduleEvent(EVENT_ARCANE_BOLT, 2s, 4500ms);
                             break;
                         default:
                             break;
@@ -287,7 +287,7 @@ class npc_ethereal_apprentice : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000);
+                _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -306,11 +306,11 @@ class npc_ethereal_apprentice : public CreatureScript
                     {
                         case EVENT_ETHEREAL_APPRENTICE_FIREBOLT:
                             DoCastVictim(SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true);
-                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FROSTBOLT, 3000);
+                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FROSTBOLT, 3s);
                             break;
                         case EVENT_ETHEREAL_APPRENTICE_FROSTBOLT:
                             DoCastVictim(SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true);
-                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000);
+                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3s);
                             break;
                         default:
                             break;
@@ -347,7 +347,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            _events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000));
+            _events.ScheduleEvent(EVENT_DOUBLE_BREATH, 6s, 9s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -364,7 +364,7 @@ public:
                     case EVENT_DOUBLE_BREATH:
                         if (me->IsWithinDist(me->GetVictim(), ATTACK_DISTANCE))
                             DoCastVictim(SPELL_DOUBLE_BREATH);
-                        _events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000));
+                        _events.ScheduleEvent(EVENT_DOUBLE_BREATH, 6s, 9s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index ea8bb96d49b..0394cb27ef5 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -71,8 +71,8 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_DARK_SHELL, 20000);
-            events.ScheduleEvent(EVENT_VOID_BLAST, urand(8000, 23000));
+            events.ScheduleEvent(EVENT_DARK_SHELL, 20s);
+            events.ScheduleEvent(EVENT_VOID_BLAST, 8s, 23s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -89,11 +89,11 @@ public:
                     if (VoidBlastCounter == 5)
                     {
                         VoidBlastCounter = 0;
-                        events.ScheduleEvent(EVENT_VOID_BLAST, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_VOID_BLAST, 15s, 25s);
                     }
                     else
                     {
-                        events.ScheduleEvent(EVENT_VOID_BLAST, 500);
+                        events.ScheduleEvent(EVENT_VOID_BLAST, 500ms);
                         events.DelayEvents(EVENT_DARK_SHELL, 500);
                     }
                     break;
@@ -102,7 +102,7 @@ public:
                         me->InterruptNonMeleeSpells(true);
                     Talk(EMOTE_DARK_SHELL);
                     DoCast(me, SPELL_DARK_SHELL);
-                    events.ScheduleEvent(EVENT_DARK_SHELL, 20000);
+                    events.ScheduleEvent(EVENT_DARK_SHELL, 20s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
index fcee93877af..17d1749662e 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
@@ -88,8 +88,8 @@ class boss_anzu : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000);
-                events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000);
+                events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14s);
+                events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -103,14 +103,14 @@ class boss_anzu : public CreatureScript
                 {
                     _under33Percent = true;
                     Talk(SAY_SUMMON_BROOD);
-                    events.ScheduleEvent(EVENT_SUMMON, 3000);
+                    events.ScheduleEvent(EVENT_SUMMON, 3s);
                 }
 
                 if (me->HealthBelowPctDamaged(66, damage) && !_under66Percent)
                 {
                     _under66Percent = true;
                     Talk(SAY_SUMMON_BROOD);
-                    events.ScheduleEvent(EVENT_SUMMON, 3000);
+                    events.ScheduleEvent(EVENT_SUMMON, 3s);
                 }
             }
 
@@ -127,12 +127,12 @@ class boss_anzu : public CreatureScript
                     {
                         case EVENT_PARALYZING_SCREECH:
                             DoCastVictim(SPELL_PARALYZING_SCREECH);
-                            events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 26000);
+                            events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 25s);
                             break;
                         case EVENT_CYCLONE_OF_FEATHERS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_CYCLONE_OF_FEATHERS);
-                            events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 21000);
+                            events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 21s);
                             break;
                         case EVENT_SUMMON:
                             // TODO: Add pathing for Brood of Anzu
@@ -140,7 +140,7 @@ class boss_anzu : public CreatureScript
                                 me->SummonCreature(NPC_BROOD_OF_ANZU, PosSummonBrood[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 46000);
 
                             DoCast(me, SPELL_BANISH_SELF);
-                            events.ScheduleEvent(EVENT_SPELL_BOMB, 12000);
+                            events.ScheduleEvent(EVENT_SPELL_BOMB, 12s);
                             break;
                         case EVENT_SPELL_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index 114f48a909f..2bd143dc9c3 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -92,10 +92,10 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000);
-            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4000);
-            events.ScheduleEvent(EVENT_FROST_SHOCK, 6000);
-            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 8000);
+            events.ScheduleEvent(EVENT_FLAME_SHOCK, 2s);
+            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4s);
+            events.ScheduleEvent(EVENT_FROST_SHOCK, 6s);
+            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 8s);
             events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 15000);
 
             Talk(SAY_AGGRO);
@@ -162,22 +162,22 @@ public:
                 case EVENT_FLAME_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_FLAME_SHOCK);
-                    events.ScheduleEvent(EVENT_FLAME_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s);
                     break;
                 case EVENT_ARCANE_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_ARCANE_SHOCK);
-                    events.ScheduleEvent(EVENT_ARCANE_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_ARCANE_SHOCK, 10s, 15s);
                     break;
                 case EVENT_FROST_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_FROST_SHOCK);
-                    events.ScheduleEvent(EVENT_FROST_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s);
                     break;
                 case EVENT_SHADOW_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_SHADOW_SHOCK);
-                    events.ScheduleEvent(EVENT_SHADOW_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_SHADOW_SHOCK, 10s, 15s);
                     break;
                 case EVENT_CHAIN_LIGHTNING:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index 43c7de61d94..c330fa842a4 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -85,11 +85,11 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5000);
-            events.ScheduleEvent(EVENT_POLYMORPH, 8000);
+            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5s);
+            events.ScheduleEvent(EVENT_POLYMORPH, 8s);
             events.ScheduleEvent(EVENT_BLINK, 35000);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_SLOW, urand(15000, 30000));
+                events.ScheduleEvent(EVENT_SLOW, 15s, 30s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -106,19 +106,19 @@ public:
                     break;
                 case EVENT_ARCANE_VOLLEY:
                     DoCast(me, SPELL_ARCANE_VOLLEY);
-                    events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(7000, 12000));
+                    events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 7s, 12s);
                     break;
                 case EVENT_SLOW:
                     DoCast(me, SPELL_SLOW);
-                    events.ScheduleEvent(EVENT_SLOW, urand(15000, 40000));
+                    events.ScheduleEvent(EVENT_SLOW, 15s, 40s);
                     break;
                 case EVENT_BLINK:
                     if (me->IsNonMeleeSpellCast(false))
                         me->InterruptNonMeleeSpells(false);
                     Talk(EMOTE_ARCANE_EXPLOSION);
                     DoCastAOE(SPELL_BLINK);
-                    events.ScheduleEvent(EVENT_BLINK, urand(35000, 40000));
-                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 1000);
+                    events.ScheduleEvent(EVENT_BLINK, 35s, 40s);
+                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 1s);
                     break;
                 case EVENT_ARCANE_EXPLOSION:
                     DoCast(me, SPELL_ARCANE_EXPLOSION);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 3bf7002c8ce..22f819d77bc 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -73,10 +73,10 @@ class boss_ambassador_hellmaw : public CreatureScript
                 _events.Reset();
                 _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, NOT_STARTED);
 
-                _events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(5000, 10000));
-                _events.ScheduleEvent(EVENT_FEAR, urand(25000, 30000));
+                _events.ScheduleEvent(EVENT_CORROSIVE_ACID, 5s, 10s);
+                _events.ScheduleEvent(EVENT_FEAR, 25s, 30s);
                 if (IsHeroic())
-                    _events.ScheduleEvent(EVENT_BERSERK, 180000);
+                    _events.ScheduleEvent(EVENT_BERSERK, 3min);
 
                 DoAction(ACTION_AMBASSADOR_HELLMAW_BANISH);
             }
@@ -154,11 +154,11 @@ class boss_ambassador_hellmaw : public CreatureScript
                     {
                         case EVENT_CORROSIVE_ACID:
                             DoCastVictim(SPELL_CORROSIVE_ACID);
-                            _events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(15000, 25000));
+                            _events.ScheduleEvent(EVENT_CORROSIVE_ACID, 15s, 25s);
                             break;
                         case EVENT_FEAR:
                             DoCastAOE(SPELL_FEAR);
-                            _events.ScheduleEvent(EVENT_FEAR, urand(20000, 35000));
+                            _events.ScheduleEvent(EVENT_FEAR, 20s, 35s);
                             break;
                         case EVENT_BERSERK:
                             DoCast(me, SPELL_ENRAGE, true);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 81dcb72821b..cf66be683f4 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -83,8 +83,8 @@ struct boss_blackheart_the_inciter : public BossAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000);
-        events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000);
+        events.ScheduleEvent(EVENT_INCITE_CHAOS, 20s);
+        events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5s);
         events.ScheduleEvent(EVENT_WAR_STOMP, 15000);
 
         Talk(SAY_AGGRO);
@@ -139,17 +139,17 @@ struct boss_blackheart_the_inciter : public BossAI
                         ResetThreatList();
                         DoCast(me, SPELL_INCITE_CHAOS);
                     }
-                    events.ScheduleEvent(EVENT_INCITE_CHAOS, 40000);
+                    events.ScheduleEvent(EVENT_INCITE_CHAOS, 40s);
                     break;
                 }
                 case EVENT_CHARGE_ATTACK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_CHARGE);
-                    events.ScheduleEvent(EVENT_CHARGE, urand(15000, 25000));
+                    events.ScheduleEvent(EVENT_CHARGE, 15s, 25s);
                     break;
                 case EVENT_WAR_STOMP:
                     DoCast(me, SPELL_WAR_STOMP);
-                    events.ScheduleEvent(EVENT_WAR_STOMP, urand(18000, 24000));
+                    events.ScheduleEvent(EVENT_WAR_STOMP, 18s, 24s);
                     break;
             }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 154a65903ec..995c1db8a14 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -112,7 +112,7 @@ class boss_grandmaster_vorpil : public CreatureScript
                     if (Creature* portal = me->SummonCreature(NPC_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000))
                         portal->CastSpell(portal, SPELL_VOID_PORTAL_VISUAL, true);
 
-                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5000);
+                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5s);
             }
 
             void spawnVoidTraveler()
@@ -141,11 +141,11 @@ class boss_grandmaster_vorpil : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000));
+                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 7s, 14s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_BANISH, 17000);
+                    events.ScheduleEvent(EVENT_BANISH, 15s);
                 events.ScheduleEvent(EVENT_DRAW_SHADOWS, 45000);
-                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 90000);
+                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 90s);
 
                 Talk(SAY_AGGRO);
                 SummonPortals();
@@ -178,12 +178,12 @@ class boss_grandmaster_vorpil : public CreatureScript
                     {
                         case EVENT_SHADOWBOLT_VOLLEY:
                             DoCast(me, SPELL_SHADOWBOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(15000, 30000));
+                            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15s, 30s);
                             break;
                         case EVENT_BANISH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, false))
                                  DoCast(target, SPELL_BANISH);
-                            events.ScheduleEvent(EVENT_BANISH, 16000);
+                            events.ScheduleEvent(EVENT_BANISH, 15s);
                             break;
                         case EVENT_DRAW_SHADOWS:
                             {
@@ -196,16 +196,16 @@ class boss_grandmaster_vorpil : public CreatureScript
                                 me->UpdatePosition(VorpilPosition);
                                 DoCast(me, SPELL_DRAW_SHADOWS, true);
                                 DoCast(me, SPELL_RAIN_OF_FIRE);
-                                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 6000);
-                                events.ScheduleEvent(EVENT_DRAW_SHADOWS, 30000);
+                                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 6s);
+                                events.ScheduleEvent(EVENT_DRAW_SHADOWS, 30s);
                                 break;
                             }
                         case EVENT_SUMMON_TRAVELER:
                             spawnVoidTraveler();
-                            events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 10000);
+                            events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 10s);
                             // enrage at 20%
                             if (HealthBelowPct(20))
-                                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5000);
+                                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5s);
                             break;
                     }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index dd25ceeed55..fe4be5ba149 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -68,14 +68,14 @@ class boss_murmur : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                events.ScheduleEvent(EVENT_SONIC_BOOM, 30000);
-                events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(8000, 20000));
-                events.ScheduleEvent(EVENT_RESONANCE, 5000);
-                events.ScheduleEvent(EVENT_MAGNETIC_PULL, urand(15000, 30000));
+                events.ScheduleEvent(EVENT_SONIC_BOOM, 30s);
+                events.ScheduleEvent(EVENT_MURMURS_TOUCH, 8s, 20s);
+                events.ScheduleEvent(EVENT_RESONANCE, 5s);
+                events.ScheduleEvent(EVENT_MAGNETIC_PULL, 15s, 30s);
                 if (IsHeroic())
                 {
                     events.ScheduleEvent(EVENT_THUNDERING_STORM, 15000);
-                    events.ScheduleEvent(EVENT_SONIC_SHOCK, 10000);
+                    events.ScheduleEvent(EVENT_SONIC_SHOCK, 10s);
                 }
 
                 // database should have `RegenHealth`=0 to prevent regen
@@ -112,29 +112,29 @@ class boss_murmur : public CreatureScript
                         case EVENT_SONIC_BOOM:
                             Talk(EMOTE_SONIC_BOOM);
                             DoCast(me, SPELL_SONIC_BOOM_CAST);
-                            events.ScheduleEvent(EVENT_SONIC_BOOM, 30000);
-                            events.ScheduleEvent(EVENT_RESONANCE, 1500);
+                            events.ScheduleEvent(EVENT_SONIC_BOOM, 30s);
+                            events.ScheduleEvent(EVENT_RESONANCE, 1500ms);
                             break;
                         case EVENT_MURMURS_TOUCH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true))
                                 DoCast(target, SPELL_MURMURS_TOUCH);
-                            events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_MURMURS_TOUCH, 25s, 35s);
                             break;
                         case EVENT_RESONANCE:
                             if (!(me->IsWithinMeleeRange(me->GetVictim())))
                             {
                                 DoCast(me, SPELL_RESONANCE);
-                                events.ScheduleEvent(EVENT_RESONANCE, 5000);
+                                events.ScheduleEvent(EVENT_RESONANCE, 5s);
                             }
                             break;
                         case EVENT_MAGNETIC_PULL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                             {
                                 DoCast(target, SPELL_MAGNETIC_PULL);
-                                events.ScheduleEvent(EVENT_MAGNETIC_PULL, urand(15000, 30000));
+                                events.ScheduleEvent(EVENT_MAGNETIC_PULL, 15s, 30s);
                                 break;
                             }
-                            events.ScheduleEvent(EVENT_MAGNETIC_PULL, 500);
+                            events.ScheduleEvent(EVENT_MAGNETIC_PULL, 500ms);
                             break;
                         case EVENT_THUNDERING_STORM:
                             DoCastAOE(SPELL_THUNDERING_STORM, true);
@@ -143,7 +143,7 @@ class boss_murmur : public CreatureScript
                         case EVENT_SONIC_SHOCK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, false))
                                 DoCast(target, SPELL_SONIC_SHOCK);
-                            events.ScheduleEvent(EVENT_SONIC_SHOCK, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_SONIC_SHOCK, 10s, 20s);
                             break;
                     }
 
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 5ec56e03ea2..6fa826f7617 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -72,7 +72,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
 
     void Reset() override
     {
-        _events.ScheduleEvent(EVENT_GET_CHANNELERS, 3000);
+        _events.ScheduleEvent(EVENT_GET_CHANNELERS, 3s);
         Initialize();
         _bloodmageList.clear();
         _deathshaperList.clear();
@@ -82,8 +82,8 @@ struct npc_wrathbone_flayer : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_CLEAVE, 5000);
-        _events.ScheduleEvent(EVENT_IGNORED, 7000);
+        _events.ScheduleEvent(EVENT_CLEAVE, 5s);
+        _events.ScheduleEvent(EVENT_IGNORED, 7s);
         _enteredCombat = true;
     }
 
@@ -121,7 +121,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
                                     (*itr)->Respawn();
                             }
 
-                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 3000);
+                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 3s);
 
                         break;
                     }
@@ -135,7 +135,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
                             if (Creature* deathshaper = ObjectAccessor::GetCreature(*me, guid))
                                 deathshaper->CastSpell(nullptr, SPELL_SUMMON_CHANNEL);
 
-                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 12000);
+                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 12s);
 
                         break;
                     }
@@ -156,12 +156,12 @@ struct npc_wrathbone_flayer : public ScriptedAI
             {
                 case EVENT_CLEAVE:
                     DoCastVictim(SPELL_CLEAVE);
-                    _events.ScheduleEvent(EVENT_CLEAVE, urand(1000, 2000));
+                    _events.ScheduleEvent(EVENT_CLEAVE, 1s, 2s);
                     break;
                 case EVENT_IGNORED:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_IGNORED);
-                    _events.ScheduleEvent(EVENT_IGNORED, 10000);
+                    _events.ScheduleEvent(EVENT_IGNORED, 10s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index 504c21fcc27..a2e0cc72b3d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -130,8 +130,8 @@ struct boss_gurtogg_bloodboil : public BossAI
     {
         Talk(SAY_AGGRO);
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-        events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
+        events.ScheduleEvent(EVENT_CHANGE_PHASE, 1min);
         ScheduleEvents();
     }
 
@@ -274,14 +274,14 @@ struct boss_gurtogg_bloodboil : public BossAI
         {
             events.SetPhase(PHASE_2);
             events.CancelEventGroup(GROUP_PHASE_1);
-            events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(30));
+            events.ScheduleEvent(EVENT_CHANGE_PHASE, 30s);
             ScheduleEvents();
         }
         else if (events.IsInPhase(PHASE_2))
         {
             events.SetPhase(PHASE_1);
             events.CancelEventGroup(GROUP_PHASE_2);
-            events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
+            events.ScheduleEvent(EVENT_CHANGE_PHASE, 1min);
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
             ScheduleEvents();
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index bf36ba6fd7b..72aab59df9c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -493,8 +493,8 @@ struct boss_illidan_stormrage : public BossAI
         me->SetCanDualWield(true);
         if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
             musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID);
-        specialEvents.ScheduleEvent(EVENT_EVADE_CHECK, Seconds(10));
-        specialEvents.ScheduleEvent(EVENT_BERSERK, Minutes(25));
+        specialEvents.ScheduleEvent(EVENT_EVADE_CHECK, 10s);
+        specialEvents.ScheduleEvent(EVENT_BERSERK, 25min);
         ScheduleEvents(GROUP_PHASE_1, GROUP_PHASE_1);
         events.ScheduleEvent(EVENT_TAUNT, Seconds(30), Seconds(60), GROUP_PHASE_ALL);
     }
@@ -638,7 +638,7 @@ struct boss_illidan_stormrage : public BossAI
                 specialEvents.Reset();
                 DoCastSelf(SPELL_DEATH, true);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                events.ScheduleEvent(EVENT_DEFEATED_TEXT, Seconds(4));
+                events.ScheduleEvent(EVENT_DEFEATED_TEXT, 4s);
                 break;
             default:
                 break;
@@ -949,7 +949,7 @@ struct boss_illidan_stormrage : public BossAI
                     DoCastSelf(SPELL_DEMON_TRANSFORM_1, true);
                     events.ScheduleEvent(EVENT_DEMON_TEXT, Seconds(2), GROUP_PHASE_ALL);
                     specialEvents.ScheduleEvent(EVENT_CANCEL_DEMON_FORM, Minutes(1) + Seconds(12));
-                    events.ScheduleEvent(EVENT_SCHEDULE_DEMON_SPELLS, Seconds(15));
+                    events.ScheduleEvent(EVENT_SCHEDULE_DEMON_SPELLS, 15s);
                     break;
                 case EVENT_SCHEDULE_DEMON_SPELLS:
                     ResetThreatList();
@@ -1013,7 +1013,7 @@ struct boss_illidan_stormrage : public BossAI
                     Talk(SAY_ILLIDAN_DEFEATED);
                     if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
                         musicController->PlayDirectMusic(EVENT_BT_ARRIVAL_WALK_HERO_1_SOUND_ID);
-                    events.ScheduleEvent(EVENT_QUIET_SUICIDE, Seconds(18));
+                    events.ScheduleEvent(EVENT_QUIET_SUICIDE, 18s);
                     break;
                 case EVENT_QUIET_SUICIDE:
                 {
@@ -1121,28 +1121,28 @@ struct npc_akama_illidan : public ScriptedAI
                 _events.SetPhase(PHASE_INTRO);
                 me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
                 _events.SetPhase(PHASE_INTRO);
-                _events.ScheduleEvent(EVENT_TELEPORT, Seconds(1));
+                _events.ScheduleEvent(EVENT_TELEPORT, 1s);
                 _events.ScheduleEvent(EVENT_MOVE_TO_ILLIDARI_ROOM, Seconds(1) + Milliseconds(500));
                 break;
             case ACTION_OPEN_DOOR:
                 _instance->SetData(ACTION_OPEN_DOOR, 0);
-                _events.ScheduleEvent(EVENT_AKAMA_THANKS, Seconds(2));
+                _events.ScheduleEvent(EVENT_AKAMA_THANKS, 2s);
                 break;
             case ACTION_FREE:
-                _events.ScheduleEvent(EVENT_FREE, Seconds(14));
+                _events.ScheduleEvent(EVENT_FREE, 14s);
                 break;
             case ACTION_START_ENCOUNTER:
                 DoZoneInCombat();
-                _events.ScheduleEvent(EVENT_HEALING_POTION, Seconds(1));
+                _events.ScheduleEvent(EVENT_HEALING_POTION, 1s);
                 break;
             case ACTION_START_MINIONS:
-                _events.ScheduleEvent(EVENT_AKAMA_MINIONS, Seconds(8));
+                _events.ScheduleEvent(EVENT_AKAMA_MINIONS, 8s);
                 break;
             case ACTION_START_OUTRO:
                 me->SetReactState(REACT_PASSIVE);
                 me->AttackStop();
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_AKAMA_MOVE_BACK, Seconds(2));
+                _events.ScheduleEvent(EVENT_AKAMA_MOVE_BACK, 2s);
                 break;
             default:
                 break;
@@ -1168,7 +1168,7 @@ struct npc_akama_illidan : public ScriptedAI
                 break;
             case POINT_STAIRS:
                 ChangeOrientation(6.265732f);
-                _events.ScheduleEvent(EVENT_AKAMA_SAY_DOOR, Seconds(5));
+                _events.ScheduleEvent(EVENT_AKAMA_SAY_DOOR, 5s);
                 break;
             case POINT_ILLIDAN_ROOM:
                 ChangeOrientation(2.129302f);
@@ -1177,7 +1177,7 @@ struct npc_akama_illidan : public ScriptedAI
                 break;
             case POINT_FACE_ILLIDAN:
                 ChangeOrientation(3.140537f);
-                _events.ScheduleEvent(EVENT_START_ILLIDAN, Seconds(2));
+                _events.ScheduleEvent(EVENT_START_ILLIDAN, 2s);
                 break;
             case POINT_TELEPORT:
                 DoCastSelf(SPELL_AKAMA_TELEPORT);
@@ -1189,13 +1189,13 @@ struct npc_akama_illidan : public ScriptedAI
                 me->SetReactState(REACT_AGGRESSIVE);
                 if (Creature* illidan = _instance->GetCreature(DATA_ILLIDAN_STORMRAGE))
                     illidan->AI()->DoAction(ACTION_START_MINIONS_WEAVE);
-                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(2));
+                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2s);
                 break;
             case POINT_MOVE_BACK:
                 _events.ScheduleEvent(EVENT_AKAMA_MOVE_TO_ILLIDAN, Milliseconds(1));
                 break;
             case POINT_ILLIDAN:
-                _events.ScheduleEvent(EVENT_AKAMA_LIGHT_TEXT, Seconds(1));
+                _events.ScheduleEvent(EVENT_AKAMA_LIGHT_TEXT, 1s);
                 break;
             default:
                 break;
@@ -1230,15 +1230,15 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_SAY_DOOR:
                     Talk(SAY_AKAMA_DOOR);
-                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_FAIL, Seconds(4));
+                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_FAIL, 4s);
                     break;
                 case EVENT_AKAMA_DOOR_FAIL:
                     DoCastSelf(SPELL_AKAMA_DOOR_FAIL);
-                    _events.ScheduleEvent(EVENT_AKAMA_SAY_ALONE, Seconds(10));
+                    _events.ScheduleEvent(EVENT_AKAMA_SAY_ALONE, 10s);
                     break;
                 case EVENT_AKAMA_SAY_ALONE:
                     Talk(SAY_AKAMA_ALONE);
-                    _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, Seconds(7));
+                    _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 7s);
                     break;
                 case EVENT_SUMMON_SPIRITS:
                     me->SummonCreatureGroup(SUMMON_GROUP);
@@ -1252,7 +1252,7 @@ struct npc_akama_illidan : public ScriptedAI
                 case EVENT_SPIRIT_SAY_2:
                     if (Creature* olum = ObjectAccessor::GetCreature(*me, _spiritOfOlumGUID))
                         olum->AI()->Talk(SAY_SPIRIT_ALONE);
-                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_SUCCESS, Seconds(6));
+                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_SUCCESS, 6s);
                     break;
                 case EVENT_AKAMA_DOOR_SUCCESS:
                     DoCastSelf(SPELL_AKAMA_DOOR_CHANNEL);
@@ -1260,7 +1260,7 @@ struct npc_akama_illidan : public ScriptedAI
                         undalo->CastSpell((Unit*) nullptr, SPELL_DEATHSWORN_DOOR_CHANNEL);
                     if (Creature* olum = ObjectAccessor::GetCreature(*me, _spiritOfOlumGUID))
                         olum->CastSpell((Unit*) nullptr, SPELL_DEATHSWORN_DOOR_CHANNEL);
-                    _events.ScheduleEvent(EVENT_AKAMA_START_SOUND, Seconds(5));
+                    _events.ScheduleEvent(EVENT_AKAMA_START_SOUND, 5s);
                     break;
                 case EVENT_AKAMA_START_SOUND:
                     if (GameObject* musicController = _instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
@@ -1268,8 +1268,8 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_THANKS:
                     Talk(SAY_AKAMA_SALUTE);
-                    _events.ScheduleEvent(EVENT_SPIRIT_SALUTE, Seconds(3));
-                    _events.ScheduleEvent(EVENT_RUN_FROM_ILLIDAN_ROOM, Seconds(7));
+                    _events.ScheduleEvent(EVENT_SPIRIT_SALUTE, 3s);
+                    _events.ScheduleEvent(EVENT_RUN_FROM_ILLIDAN_ROOM, 7s);
                     break;
                 case EVENT_SPIRIT_SALUTE:
                     if (Creature* undalo = ObjectAccessor::GetCreature(*me, _spiritOfUdaloGUID))
@@ -1292,11 +1292,11 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_FREE:
                     Talk(SAY_AKAMA_FREE);
-                    _events.ScheduleEvent(EVENT_TIME_HAS_COME, Seconds(18));
+                    _events.ScheduleEvent(EVENT_TIME_HAS_COME, 18s);
                     break;
                 case EVENT_TIME_HAS_COME:
                     Talk(SAY_AKAMA_TIME_HAS_COME);
-                    _events.ScheduleEvent(EVENT_ROAR, Seconds(2));
+                    _events.ScheduleEvent(EVENT_ROAR, 2s);
                     break;
                 case EVENT_ROAR:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
@@ -1312,14 +1312,14 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_MINIONS:
                     Talk(SAY_AKAMA_MINIONS);
-                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_EMOTE, Seconds(2));
+                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_EMOTE, 2s);
                     break;
                 case EVENT_AKAMA_MINIONS_EMOTE:
                     me->SetReactState(REACT_PASSIVE);
                     me->AttackStop();
                     me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
                     me->SetImmuneToNPC(true);
-                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_MOVE, Seconds(4));
+                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_MOVE, 4s);
                     break;
                 case EVENT_AKAMA_MINIONS_MOVE:
                     _isTeleportToMinions = true;
@@ -1341,11 +1341,11 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_LIGHT_TEXT:
                     Talk(SAY_AKAMA_LIGHT);
-                    _events.ScheduleEvent(EVENT_FINAL_SALUTE, Seconds(4));
+                    _events.ScheduleEvent(EVENT_FINAL_SALUTE, 4s);
                     break;
                 case EVENT_FINAL_SALUTE:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
-                    _events.ScheduleEvent(EVENT_AKAMA_DESPAWN, Seconds(5));
+                    _events.ScheduleEvent(EVENT_AKAMA_DESPAWN, 5s);
                     break;
                 case EVENT_AKAMA_DESPAWN:
                     DoCastSelf(SPELL_AKAMA_DESPAWN, true);
@@ -1486,8 +1486,8 @@ struct npc_flame_of_azzinoth : public ScriptedAI
             illidan->AI()->JustSummoned(me);
         DoCastSelf(SPELL_FLAME_TEAR_OF_AZZINOTH, true); // Idk what this spell should do
         me->SetReactState(REACT_PASSIVE);
-        _events.ScheduleEvent(EVENT_ENGAGE, Seconds(3));
-        _events.ScheduleEvent(EVENT_FLAME_BLAST, Seconds(11));
+        _events.ScheduleEvent(EVENT_ENGAGE, 3s);
+        _events.ScheduleEvent(EVENT_FLAME_BLAST, 11s);
     }
 
     void UpdateAI(uint32 diff) override
@@ -1507,7 +1507,7 @@ struct npc_flame_of_azzinoth : public ScriptedAI
                 case EVENT_ENGAGE:
                     me->SetReactState(REACT_AGGRESSIVE);
                     DoZoneInCombat();
-                    _events.ScheduleEvent(EVENT_FLAME_CHARGE, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FLAME_CHARGE, 5s);
                     break;
                 case EVENT_FLAME_CHARGE:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, ChargeTargetSelector()))
@@ -1627,19 +1627,19 @@ struct npc_maiev : public ScriptedAI
             me->SetFacingToObject(illidan);
         me->SetReactState(REACT_PASSIVE);
         _events.SetPhase(PHASE_INTRO);
-        _events.ScheduleEvent(EVENT_MAIEV_APPEAR, Seconds(1));
-        _events.ScheduleEvent(EVENT_MAIEV_EXCLAMATION, Seconds(2));
-        _events.ScheduleEvent(EVENT_MAIEV_JUSTICE_TEXT, Seconds(14));
-        _events.ScheduleEvent(EVENT_TAUNT, Seconds(20), Seconds(60));
+        _events.ScheduleEvent(EVENT_MAIEV_APPEAR, 1s);
+        _events.ScheduleEvent(EVENT_MAIEV_EXCLAMATION, 2s);
+        _events.ScheduleEvent(EVENT_MAIEV_JUSTICE_TEXT, 14s);
+        _events.ScheduleEvent(EVENT_TAUNT, 20s, 1min);
         _canDown = true;
     }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
         _events.SetPhase(PHASE_1);
-        _events.ScheduleEvent(EVENT_CAGE_TRAP, Seconds(30));
-        _events.ScheduleEvent(EVENT_SHADOW_STRIKE, Seconds(50));
-        _events.ScheduleEvent(EVENT_THROW_DAGGER, Seconds(1));
+        _events.ScheduleEvent(EVENT_CAGE_TRAP, 30s);
+        _events.ScheduleEvent(EVENT_SHADOW_STRIKE, 50s);
+        _events.ScheduleEvent(EVENT_THROW_DAGGER, 1s);
     }
 
     void DoAction(int32 actionId) override
@@ -1652,7 +1652,7 @@ struct npc_maiev : public ScriptedAI
             if (Creature* illidan = _instance->GetCreature(DATA_ILLIDAN_STORMRAGE))
                 me->SetFacingToObject(illidan);
             Talk(SAY_MAIEV_SHADOWSONG_FINISHED);
-            _events.ScheduleEvent(EVENT_MAIEV_OUTRO_TEXT, Seconds(28));
+            _events.ScheduleEvent(EVENT_MAIEV_OUTRO_TEXT, 28s);
         }
         else if (actionId == ACTION_MAIEV_DOWN_FADE)
             _canDown = true;
@@ -1691,15 +1691,15 @@ struct npc_maiev : public ScriptedAI
                     break;
                 case EVENT_MAIEV_JUSTICE_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_JUSTICE);
-                    _events.ScheduleEvent(EVENT_MAIEV_YES, Seconds(2));
+                    _events.ScheduleEvent(EVENT_MAIEV_YES, 2s);
                     break;
                 case EVENT_MAIEV_YES:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_YES);
-                    _events.ScheduleEvent(EVENT_MAIEV_ROAR, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_ROAR, 3s);
                     break;
                 case EVENT_MAIEV_ROAR:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
-                    _events.ScheduleEvent(EVENT_MAIEV_COMBAT, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_COMBAT, 3s);
                     break;
                 case EVENT_MAIEV_COMBAT:
                     me->SetReactState(REACT_AGGRESSIVE);
@@ -1733,11 +1733,11 @@ struct npc_maiev : public ScriptedAI
                     break;
                 case EVENT_MAIEV_OUTRO_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_OUTRO);
-                    _events.ScheduleEvent(EVENT_MAIEV_FAREWELL_TEXT, Seconds(11));
+                    _events.ScheduleEvent(EVENT_MAIEV_FAREWELL_TEXT, 11s);
                     break;
                 case EVENT_MAIEV_FAREWELL_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_FAREWELL);
-                    _events.ScheduleEvent(EVENT_MAIEV_TELEPORT_DESPAWN, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_TELEPORT_DESPAWN, 3s);
                     break;
                 case EVENT_MAIEV_TELEPORT_DESPAWN:
                     DoCastSelf(SPELL_TELEPORT_VISUAL);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index 9c1138b39d8..0eaf3212573 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -157,8 +157,8 @@ struct boss_illidari_council : public BossAI
                     DoZoneInCombat(council);
                 }
             }
-            events.ScheduleEvent(EVENT_EMPYREAL_EQUIVALENCY, Seconds(2));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
+            events.ScheduleEvent(EVENT_EMPYREAL_EQUIVALENCY, 2s);
+            events.ScheduleEvent(EVENT_BERSERK, 15min);
             if (Creature* council = instance->GetCreature(CouncilData[urand(0, 3)]))
                 council->AI()->Talk(SAY_COUNCIL_AGRO);
         }
@@ -314,11 +314,11 @@ struct boss_gathios_the_shatterer : public IllidariCouncilBossAI
     void ScheduleEvents() override
     {
         DoCastSelf(SPELL_SEAL_OF_BLOOD);
-        events.ScheduleEvent(EVENT_BLESS, Seconds(20));
-        events.ScheduleEvent(EVENT_CONSECRATION, Seconds(10));
-        events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, Seconds(10));
-        events.ScheduleEvent(EVENT_JUDGEMENT, Seconds(15));
-        events.ScheduleEvent(EVENT_AURA, Seconds(6));
+        events.ScheduleEvent(EVENT_BLESS, 20s);
+        events.ScheduleEvent(EVENT_CONSECRATION, 10s);
+        events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 10s);
+        events.ScheduleEvent(EVENT_JUDGEMENT, 15s);
+        events.ScheduleEvent(EVENT_AURA, 6s);
     }
 
     void ExecuteEvent(uint32 eventId) override
@@ -376,16 +376,16 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_FLAMESTRIKE, Seconds(8));
-        events.ScheduleEvent(EVENT_BLIZZARD, Seconds(25));
-        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, Seconds(5));
+        events.ScheduleEvent(EVENT_FLAMESTRIKE, 8s);
+        events.ScheduleEvent(EVENT_BLIZZARD, 25s);
+        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s);
         DoCastSelf(SPELL_DAMPEN_MAGIC);
     }
 
     void DoAction(int32 actionId) override
     {
         if (actionId == ACTION_REFRESH_DAMPEN)
-            events.ScheduleEvent(EVENT_DAMPEN_MAGIC, Seconds(50));
+            events.ScheduleEvent(EVENT_DAMPEN_MAGIC, 50s);
     }
     void ExecuteEvent(uint32 eventId) override
     {
@@ -410,7 +410,7 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI
                 {
                     DoCastSelf(SPELL_ARCANE_EXPLOSION);
                     _canUseArcaneExplosion = false;
-                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_CHECK, Seconds(5));
+                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_CHECK, 5s);
                 }
                 events.Repeat(Seconds(1));
                 break;
@@ -452,9 +452,9 @@ struct boss_lady_malande : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_CIRCLE_OF_HEALING, Seconds(20));
-        events.ScheduleEvent(EVENT_REFLECTIVE_SHIELD, Seconds(25));
-        events.ScheduleEvent(EVENT_DIVINE_WRATH, Seconds(32));
+        events.ScheduleEvent(EVENT_CIRCLE_OF_HEALING, 20s);
+        events.ScheduleEvent(EVENT_REFLECTIVE_SHIELD, 25s);
+        events.ScheduleEvent(EVENT_DIVINE_WRATH, 32s);
     }
 
     void HealReceived(Unit* /*who*/, uint32& addhealth) override
@@ -516,8 +516,8 @@ struct boss_veras_darkshadow : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_DEADLY_STRIKE, Seconds(18));
-        events.ScheduleEvent(EVENT_VANISH, Seconds(18));
+        events.ScheduleEvent(EVENT_DEADLY_STRIKE, 18s);
+        events.ScheduleEvent(EVENT_VANISH, 18s);
     }
 
     void ExecuteEvent(uint32 eventId) override
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index b9481c34c03..1b29454a9fb 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -121,12 +121,12 @@ struct boss_mother_shahraz : public BossAI
     {
         _JustEngagedWith();
         Talk(SAY_AGGRO);
-        events.ScheduleEvent(EVENT_SILENCING_SHRIEK, Seconds(22));
-        events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, Seconds(15));
-        events.ScheduleEvent(EVENT_FATAL_ATTRACTION, Seconds(35));
-        events.ScheduleEvent(EVENT_RANDOM_BEAM, Seconds(6));
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-        events.ScheduleEvent(EVENT_TAUNT, Seconds(35));
+        events.ScheduleEvent(EVENT_SILENCING_SHRIEK, 22s);
+        events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, 15s);
+        events.ScheduleEvent(EVENT_FATAL_ATTRACTION, 35s);
+        events.ScheduleEvent(EVENT_RANDOM_BEAM, 6s);
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
+        events.ScheduleEvent(EVENT_TAUNT, 35s);
     }
 
     void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 672d0ba67ef..76b910ccae6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -158,7 +158,7 @@ struct boss_reliquary_of_souls : public BossAI
             _inCombat = true;
             DoZoneInCombat();
             me->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_STAND_STATE, UNIT_STAND_STATE_STAND);
-            events.ScheduleEvent(EVENT_SUBMERGE, Seconds(10));
+            events.ScheduleEvent(EVENT_SUBMERGE, 10s);
         }
     }
 
@@ -182,13 +182,13 @@ struct boss_reliquary_of_souls : public BossAI
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
                 events.SetPhase(PHASE_ESSENCE_OF_DESIRE);
                 HandleSpirits();
-                events.ScheduleEvent(EVENT_SUBMERGE, Seconds(40));
+                events.ScheduleEvent(EVENT_SUBMERGE, 40s);
                 break;
             case ACTION_ESSENCE_OF_DESIRE_DEAD:
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
                 events.SetPhase(PHASE_ESSENCE_OF_ANGER);
                 HandleSpirits();
-                events.ScheduleEvent(EVENT_SUBMERGE, Seconds(40));
+                events.ScheduleEvent(EVENT_SUBMERGE, 40s);
                 break;
             case ACTION_KILL_SELF:
                 me->KillSelf();
@@ -270,7 +270,7 @@ struct boss_reliquary_of_souls : public BossAI
             {
                 case EVENT_SUBMERGE:
                     DoCastSelf(SPELL_SUBMERGE_VISUAL, true);
-                    events.ScheduleEvent(EVENT_SUMMON_ESSENCE, Seconds(3));
+                    events.ScheduleEvent(EVENT_SUMMON_ESSENCE, 3s);
                     break;
                 case EVENT_SUMMON_ESSENCE:
                 {
@@ -345,8 +345,8 @@ struct boss_essence_of_suffering : public BossAI
         me->setActive(true);
         DoZoneInCombat();
 
-        events.ScheduleEvent(EVENT_SOUL_DRAIN, Seconds(20));
-        events.ScheduleEvent(EVENT_FRENZY, Seconds(45));
+        events.ScheduleEvent(EVENT_SOUL_DRAIN, 20s);
+        events.ScheduleEvent(EVENT_FRENZY, 45s);
         Talk(SUFF_SAY_AGRO);
     }
 
@@ -415,9 +415,9 @@ struct boss_essence_of_desire : public BossAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        events.ScheduleEvent(EVENT_SPIRIT_SHOCK, Seconds(11));
-        events.ScheduleEvent(EVENT_RUNE_SHIELD, Seconds(16));
-        events.ScheduleEvent(EVENT_DEADEN, Seconds(31));
+        events.ScheduleEvent(EVENT_SPIRIT_SHOCK, 11s);
+        events.ScheduleEvent(EVENT_RUNE_SHIELD, 16s);
+        events.ScheduleEvent(EVENT_DEADEN, 31s);
 
         me->SetCombatPulseDelay(5);
         me->setActive(true);
@@ -529,9 +529,9 @@ struct boss_essence_of_anger : public BossAI
     {
         Talk(ANGER_SAY_FREED);
 
-        events.ScheduleEvent(EVENT_START_CHECK_TANKER, Seconds(5));
-        events.ScheduleEvent(EVENT_SOUL_SCREAM, Seconds(11));
-        events.ScheduleEvent(EVENT_SPITE, Seconds(20));
+        events.ScheduleEvent(EVENT_START_CHECK_TANKER, 5s);
+        events.ScheduleEvent(EVENT_SOUL_SCREAM, 11s);
+        events.ScheduleEvent(EVENT_SPITE, 20s);
         events.ScheduleEvent(EVENT_FREED_2, Seconds(1), Minutes(3));
 
         me->SetCombatPulseDelay(5);
@@ -588,7 +588,7 @@ struct boss_essence_of_anger : public BossAI
                     if (Unit* target = me->GetVictim())
                     {
                         _targetGUID = target->GetGUID();
-                        events.ScheduleEvent(EVENT_CHECK_TANKER, Seconds(1));
+                        events.ScheduleEvent(EVENT_CHECK_TANKER, 1s);
                     }
                     else
                         events.Repeat(Seconds(1));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 3535c5b4ea1..5d349bd0e14 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -220,7 +220,7 @@ struct boss_shade_of_akama : public BossAI
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN);
         me->SetWalk(true);
-        events.ScheduleEvent(EVENT_INITIALIZE_SPAWNERS, Seconds(1));
+        events.ScheduleEvent(EVENT_INITIALIZE_SPAWNERS, 1s);
         me->SummonCreatureGroup(SUMMON_GROUP_RESET);
     }
 
@@ -240,9 +240,9 @@ struct boss_shade_of_akama : public BossAI
     {
         if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL)
         {
-            events.ScheduleEvent(EVENT_START_CHANNELERS_AND_SPAWNERS, Seconds(1));
+            events.ScheduleEvent(EVENT_START_CHANNELERS_AND_SPAWNERS, 1s);
             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
-            events.ScheduleEvent(EVENT_EVADE_CHECK, Seconds(10));
+            events.ScheduleEvent(EVENT_EVADE_CHECK, 10s);
             if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE))
                 AttackStart(akama);
         }
@@ -392,8 +392,8 @@ struct npc_akama_shade : public ScriptedAI
             {
                 shade->RemoveAurasDueToSpell(SPELL_AKAMA_SOUL_CHANNEL);
                 AttackStart(shade);
-                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(2));
-                _events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, Seconds(5));
+                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2s);
+                _events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5s);
             }
         }
     }
@@ -426,12 +426,12 @@ struct npc_akama_shade : public ScriptedAI
             return;
 
         if (pointId == AKAMA_CHANNEL_WAYPOINT)
-            _events.ScheduleEvent(EVENT_SHADE_CHANNEL, Seconds(1));
+            _events.ScheduleEvent(EVENT_SHADE_CHANNEL, 1s);
 
         else if (pointId == AKAMA_INTRO_WAYPOINT)
         {
             me->SetWalk(false);
-            _events.ScheduleEvent(EVENT_START_SOUL_RETRIEVE, Seconds(1));
+            _events.ScheduleEvent(EVENT_START_SOUL_RETRIEVE, 1s);
         }
     }
 
@@ -468,7 +468,7 @@ struct npc_akama_shade : public ScriptedAI
                     me->SetFacingTo(FACE_THE_PLATFORM);
                     DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL);
                     me->SetFaction(FACTION_MONSTER_SPAR_BUDDY);
-                    _events.ScheduleEvent(EVENT_FIXATE, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FIXATE, 5s);
                     break;
                 case EVENT_FIXATE:
                     DoCast(SPELL_FIXATE);
@@ -484,7 +484,7 @@ struct npc_akama_shade : public ScriptedAI
                 case EVENT_START_SOUL_RETRIEVE:
                     me->SetFacingTo(FACE_THE_DOOR);
                     DoCast(SPELL_AKAMA_SOUL_RETRIEVE);
-                    _events.ScheduleEvent(EVENT_START_BROKEN_FREE, Seconds(15));
+                    _events.ScheduleEvent(EVENT_START_BROKEN_FREE, 15s);
                     break;
                 case EVENT_START_BROKEN_FREE:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
@@ -623,12 +623,12 @@ struct npc_creature_generator_akama : public ScriptedAI
                 if (_leftSide)
                 {
                     _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, Milliseconds(100));
-                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, Seconds(2), Seconds(5));
+                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, 2s, 5s);
                 }
                 else
                 {
-                    _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, Seconds(10));
-                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, Seconds(2), Seconds(5));
+                    _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, 10s);
+                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, 2s, 5s);
                 }
                 break;
             case ACTION_STOP_SPAWNING:
@@ -789,10 +789,10 @@ struct npc_ashtongue_defender : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(5));
-        _events.ScheduleEvent(EVENT_SHIELD_BASH, Seconds(10), Seconds(16));
-        _events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, Seconds(10), Seconds(16));
-        _events.ScheduleEvent(EVENT_WINDFURY, Seconds(8), Seconds(12));
+        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5s);
+        _events.ScheduleEvent(EVENT_SHIELD_BASH, 10s, 16s);
+        _events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, 10s, 16s);
+        _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s);
     }
 
 
@@ -857,7 +857,7 @@ struct npc_ashtongue_rogue : public ScriptedAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _events.ScheduleEvent(EVENT_DEBILITATING_POISON, Milliseconds(500), Seconds(2));
-        _events.ScheduleEvent(EVENT_EVISCERATE, Seconds(2), Seconds(5));
+        _events.ScheduleEvent(EVENT_EVISCERATE, 2s, 5s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override { }
@@ -914,8 +914,8 @@ struct npc_ashtongue_elementalist : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_RAIN_OF_FIRE, Seconds(18));
-        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(6));
+        _events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 18s);
+        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 6s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override { }
@@ -981,7 +981,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_SPIRIT_HEAL, Seconds(5), Seconds(6));
+        _events.ScheduleEvent(EVENT_SPIRIT_HEAL, 5s, 6s);
     }
 
     void DamageTaken(Unit* /*who*/, uint32& /*damage*/) override
@@ -991,7 +991,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
             {
                 DoCastSelf(SPELL_SPIRIT_MEND);
                 _spiritMend = true;
-                _events.ScheduleEvent(EVENT_SPIRIT_MEND_RESET, Seconds(10), Seconds(15));
+                _events.ScheduleEvent(EVENT_SPIRIT_MEND_RESET, 10s, 15s);
             }
 
         if (!_chainHeal)
@@ -999,7 +999,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
             {
                 DoCastSelf(SPELL_CHAIN_HEAL);
                 _chainHeal = true;
-                _events.ScheduleEvent(EVENT_CHAIN_HEAL_RESET, Seconds(10), Seconds(15));
+                _events.ScheduleEvent(EVENT_CHAIN_HEAL_RESET, 10s, 15s);
             }
 
     }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index bdb4ac7415b..f14f180815b 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -85,8 +85,8 @@ struct boss_supremus : public BossAI
     {
         _JustEngagedWith();
         ChangePhase();
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
-        events.ScheduleEvent(EVENT_FLAME, Seconds(20));
+        events.ScheduleEvent(EVENT_BERSERK, 15min);
+        events.ScheduleEvent(EVENT_FLAME, 20s);
     }
 
     void ChangePhase()
@@ -112,7 +112,7 @@ struct boss_supremus : public BossAI
         }
         ResetThreatList();
         DoZoneInCombat();
-        events.ScheduleEvent(EVENT_SWITCH_PHASE, Seconds(60));
+        events.ScheduleEvent(EVENT_SWITCH_PHASE, 1min);
     }
 
     Unit* CalculateHatefulStrikeTarget()
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 72e85a5d135..c6d8343e0e6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -126,11 +126,11 @@ struct boss_teron_gorefiend : public BossAI
         _JustEngagedWith();
         Talk(SAY_AGGRO);
         events.SetPhase(PHASE_COMBAT);
-        events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
-        events.ScheduleEvent(EVENT_INCINERATE, Seconds(12));
-        events.ScheduleEvent(EVENT_SUMMON_DOOM_BLOSSOM, Seconds(8));
-        events.ScheduleEvent(EVENT_SHADOW_DEATH, Seconds(8));
-        events.ScheduleEvent(EVENT_CRUSHING_SHADOWS, Seconds(18));
+        events.ScheduleEvent(EVENT_ENRAGE, 10min);
+        events.ScheduleEvent(EVENT_INCINERATE, 12s);
+        events.ScheduleEvent(EVENT_SUMMON_DOOM_BLOSSOM, 8s);
+        events.ScheduleEvent(EVENT_SHADOW_DEATH, 8s);
+        events.ScheduleEvent(EVENT_CRUSHING_SHADOWS, 18s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override
@@ -147,7 +147,7 @@ struct boss_teron_gorefiend : public BossAI
             instance->SetData(DATA_TERON_GOREFIEND_INTRO, 0);
             Talk(SAY_INTRO);
             events.SetPhase(PHASE_INTRO);
-            events.ScheduleEvent(EVENT_FINISH_INTRO, Seconds(20));
+            events.ScheduleEvent(EVENT_FINISH_INTRO, 20s);
         }
     }
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index e03dd231c7a..da706660947 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -105,11 +105,11 @@ struct boss_najentus : public BossAI
     {
         _JustEngagedWith();
         Talk(SAY_AGGRO);
-        events.ScheduleEvent(EVENT_NEEDLE, Seconds(2));
-        events.ScheduleEvent(EVENT_SHIELD, Seconds(60));
-        events.ScheduleEvent(EVENT_SPINE, Seconds(30));
-        events.ScheduleEvent(EVENT_BERSERK, Seconds(480));
-        events.ScheduleEvent(EVENT_YELL, Seconds(45), Seconds(100));
+        events.ScheduleEvent(EVENT_NEEDLE, 2s);
+        events.ScheduleEvent(EVENT_SHIELD, 1min);
+        events.ScheduleEvent(EVENT_SPINE, 30s);
+        events.ScheduleEvent(EVENT_BERSERK, 480s);
+        events.ScheduleEvent(EVENT_YELL, 45s, 100s);
     }
 
     uint32 GetData(uint32 data) const override
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index cee8aad089f..e57c02ab2b4 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -73,8 +73,8 @@ class boss_hydromancer_thespia : public CreatureScript
                 _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000);
-                events.ScheduleEvent(EVENT_LUNG_BURST, 7000);
-                events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 9000);
+                events.ScheduleEvent(EVENT_LUNG_BURST, 7s);
+                events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 9s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -89,12 +89,12 @@ class boss_hydromancer_thespia : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                                 DoCast(target, SPELL_LIGHTNING_CLOUD);
 
-                        events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15s, 25s);
                         break;
                     case EVENT_LUNG_BURST:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_LUNG_BURST);
-                        events.ScheduleEvent(EVENT_LUNG_BURST, urand(7000, 12000));
+                        events.ScheduleEvent(EVENT_LUNG_BURST, 7s, 12s);
                         break;
                     case EVENT_ENVELOPING_WINDS:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true))
@@ -104,7 +104,7 @@ class boss_hydromancer_thespia : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true))
                                 DoCast(target, SPELL_ENVELOPING_WINDS);
 
-                        events.ScheduleEvent(EVENT_ENVELOPING_WINDS, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 10s, 15s);
                         break;
                     default:
                         break;
@@ -140,7 +140,7 @@ class npc_coilfang_waterelemental : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(3000, 6000));
+                _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, 3s, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -159,7 +159,7 @@ class npc_coilfang_waterelemental : public CreatureScript
                     {
                         case EVENT_WATER_BOLT_VOLLEY:
                             DoCast(me, SPELL_WATER_BOLT_VOLLEY);
-                            _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(7000, 12000));
+                            _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, 7s, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index ec905fd47b2..7a6193102a2 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -215,7 +215,7 @@ struct boss_ahune : public BossAI
         if (action == ACTION_AHUNE_RETREAT)
         {
             Submerge();
-            events.ScheduleEvent(EVENT_EMERGE, Seconds(35));
+            events.ScheduleEvent(EVENT_EMERGE, 35s);
         }
     }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
index c8dbc4e1068..eeed56baff1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
@@ -74,11 +74,11 @@ class boss_mennu_the_betrayer : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000);
-                events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20000);
-                events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 60000);
-                events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, urand(14000, 25000));
-                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, urand(14000, 19000));
+                events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s);
+                events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20s);
+                events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 1min);
+                events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, 14s, 25s);
+                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 14s, 19s);
                 Talk(SAY_AGGRO);
             }
 
@@ -104,7 +104,7 @@ class boss_mennu_the_betrayer : public CreatureScript
                         case EVENT_TAINTED_STONESKIN_TOTEM:
                             if (HealthBelowPct(100))
                                 DoCast(me, SPELL_TAINTED_STONESKIN_TOTEM);
-                            events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000);
+                            events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s);
                             break;
                         case EVENT_TAINTED_EARTHGRAB_TOTEM:
                             DoCast(me, SPELL_TAINTED_EARTHGRAB_TOTEM);
@@ -114,11 +114,11 @@ class boss_mennu_the_betrayer : public CreatureScript
                             break;
                         case EVENT_MENNUS_HEALING_WARD:
                             DoCast(me, SPELL_MENNUS_HEALING_WARD);
-                            events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, urand(14000, 25000));
+                            events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, 14s, 25s);
                             break;
                         case EVENT_LIGHTNING_BOLT:
                             DoCastVictim(SPELL_LIGHTNING_BOLT, true);
-                            events.ScheduleEvent(EVENT_LIGHTNING_BOLT, urand(14000, 25000));
+                            events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 14s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
index aecdef0c945..ca0c368e998 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
@@ -65,9 +65,9 @@ class boss_quagmirran : public CreatureScript
             {
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_ACID_SPRAY, 25000);
-                events.ScheduleEvent(EVENT_CLEAVE, 9000);
-                events.ScheduleEvent(EVENT_UPPERCUT, 20000);
-                events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31000);
+                events.ScheduleEvent(EVENT_CLEAVE, 9s);
+                events.ScheduleEvent(EVENT_UPPERCUT, 20s);
+                events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31s);
             }
 
             void KilledUnit(Unit* /*victim*/) override { }
@@ -88,20 +88,20 @@ class boss_quagmirran : public CreatureScript
                     {
                         case EVENT_ACID_SPRAY:
                             DoCastAOE(SPELL_ACID_SPRAY);
-                            events.ScheduleEvent(EVENT_ACID_SPRAY, urand(20000, 25000));
+                            events.ScheduleEvent(EVENT_ACID_SPRAY, 20s, 25s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE, true);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(18000, 34000));
+                            events.ScheduleEvent(EVENT_CLEAVE, 18s, 34s);
                             break;
                         case EVENT_UPPERCUT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true))
                             DoCast(target, SPELL_UPPERCUT);
-                            events.ScheduleEvent(EVENT_UPPERCUT, 22000);
+                            events.ScheduleEvent(EVENT_UPPERCUT, 22s);
                             break;
                         case EVENT_POISON_BOLT_VOLLEY:
                             DoCast(me, SPELL_POISON_BOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 24000);
+                            events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 24s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index 15d6a08e32a..a3fed69e2ef 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -72,9 +72,9 @@ class boss_rokmar_the_crackler : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000);
-                events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20000);
-                events.ScheduleEvent(EVENT_WATER_SPIT, 14000);
+                events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10s);
+                events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s);
+                events.ScheduleEvent(EVENT_WATER_SPIT, 14s);
             }
 
             void KilledUnit(Unit* /*victim*/) override { }
@@ -95,15 +95,15 @@ class boss_rokmar_the_crackler : public CreatureScript
                     {
                         case EVENT_GRIEVOUS_WOUND:
                             DoCastVictim(SPELL_GRIEVOUS_WOUND, true);
-                            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 20s, 30s);
                             break;
                         case EVENT_ENSNARING_MOSS:
                             DoCastAOE(SPELL_ENSNARING_MOSS);
-                            events.ScheduleEvent(EVENT_ENSNARING_MOSS, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s, 30s);
                             break;
                         case EVENT_WATER_SPIT:
                             DoCastAOE(SPELL_WATER_SPIT);
-                            events.ScheduleEvent(EVENT_WATER_SPIT, urand(14000, 18000));
+                            events.ScheduleEvent(EVENT_WATER_SPIT, 14s, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index eb471ad95eb..88551936f2b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -83,15 +83,15 @@ class boss_broggok : public CreatureScript
                 {
                     case EVENT_SLIME_SPRAY:
                         DoCastVictim(SPELL_SLIME_SPRAY);
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 4s, 12s);
                         break;
                     case EVENT_POISON_BOLT:
                         DoCastVictim(SPELL_POISON_BOLT);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_POISON_BOLT, 4s, 12s);
                         break;
                     case EVENT_POISON_CLOUD:
                         DoCast(me, SPELL_POISON_CLOUD);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 20000);
+                        events.ScheduleEvent(EVENT_POISON_CLOUD, 20s);
                         break;
                     default:
                         break;
@@ -109,9 +109,9 @@ class boss_broggok : public CreatureScript
                         me->SetReactState(REACT_AGGRESSIVE);
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         me->SetImmuneToAll(false);
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10000);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, 7000);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 5000);
+                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10s);
+                        events.ScheduleEvent(EVENT_POISON_BOLT, 7s);
+                        events.ScheduleEvent(EVENT_POISON_CLOUD, 5s);
                         break;
                     case ACTION_RESET_BROGGOK:
                         me->SetReactState(REACT_PASSIVE);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index d0c817aafef..5caa97218b7 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -57,9 +57,9 @@ class boss_the_maker : public CreatureScript
                 Talk(SAY_AGGRO);
 
                 events.ScheduleEvent(EVENT_ACID_SPRAY, 15000);
-                events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 6000);
+                events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 6s);
                 events.ScheduleEvent(EVENT_DOMINATION, 120000);
-                events.ScheduleEvent(EVENT_KNOCKDOWN, 10000);
+                events.ScheduleEvent(EVENT_KNOCKDOWN, 10s);
             }
 
             void KilledUnit(Unit* who) override
@@ -80,12 +80,12 @@ class boss_the_maker : public CreatureScript
                 {
                     case EVENT_ACID_SPRAY:
                         DoCastVictim(SPELL_ACID_SPRAY);
-                        events.ScheduleEvent(EVENT_ACID_SPRAY, urand(15000, 23000));
+                        events.ScheduleEvent(EVENT_ACID_SPRAY, 15s, 23s);
                         break;
                     case EVENT_EXPLODING_BREAKER:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                             DoCast(target, SPELL_EXPLODING_BREAKER);
-                        events.ScheduleEvent(EVENT_EXPLODING_BREAKER, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 4s, 12s);
                         break;
                     case EVENT_DOMINATION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
@@ -94,7 +94,7 @@ class boss_the_maker : public CreatureScript
                         break;
                     case EVENT_KNOCKDOWN:
                         DoCastVictim(SPELL_KNOCKDOWN);
-                        events.ScheduleEvent(EVENT_KNOCKDOWN, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_KNOCKDOWN, 4s, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index b9f3feb7bf3..17b01873c38 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -79,8 +79,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000);
-                events.ScheduleEvent(EVENT_SURGE, 4000);
+                events.ScheduleEvent(EVENT_MORTAL_WOUND, 5s);
+                events.ScheduleEvent(EVENT_SURGE, 4s);
                 _JustEngagedWith();
             }
 
@@ -139,7 +139,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                             break;
                         case EVENT_RETALIATION:
                             DoCast(me, SPELL_RETALIATION);
-                            events.ScheduleEvent(EVENT_RETALIATION, 30000);
+                            events.ScheduleEvent(EVENT_RETALIATION, 30s);
                             break;
                         default:
                             break;
@@ -150,7 +150,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                 {
                     if (HealthBelowPct(20))
                     {
-                        events.ScheduleEvent(EVENT_RETALIATION, 1000);
+                        events.ScheduleEvent(EVENT_RETALIATION, 1s);
                         retaliation = true;
                     }
                 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 10ccf9b54da..c384c685373 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -141,7 +141,7 @@ class boss_magtheridon : public CreatureScript
             {
                 events.CancelEvent(EVENT_START_FIGHT);
                 events.CancelEvent(EVENT_NEARLY_EMOTE);
-                events.ScheduleEvent(EVENT_RELEASED, Seconds(6));
+                events.ScheduleEvent(EVENT_RELEASED, 6s);
                 Talk(EMOTE_BREAKS_FREE, me);
                 Talk(SAY_FREE);
                 me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C);
@@ -176,8 +176,8 @@ class boss_magtheridon : public CreatureScript
                     events.SetPhase(PHASE_1);
                     Talk(EMOTE_WEAKEN, me);
                     summons.DoZoneInCombat(NPC_HELLFIRE_CHANNELLER);
-                    events.ScheduleEvent(EVENT_START_FIGHT, Minutes(2));
-                    events.ScheduleEvent(EVENT_NEARLY_EMOTE, Seconds(60));
+                    events.ScheduleEvent(EVENT_START_FIGHT, 2min);
+                    events.ScheduleEvent(EVENT_NEARLY_EMOTE, 1min);
                     events.CancelEvent(EVENT_TAUNT);
                     instance->SetBossState(DATA_MAGTHERIDON, IN_PROGRESS);
                     instance->SetData(DATA_CALL_WARDERS, ACTION_ENABLE);
@@ -200,7 +200,7 @@ class boss_magtheridon : public CreatureScript
                     Talk(SAY_COLLAPSE);
                     instance->SetData(DATA_COLLAPSE, ACTION_ENABLE);
                     DoCastAOE(SPELL_CAMERA_SHAKE);
-                    events.ScheduleEvent(EVENT_COLLAPSE, Seconds(6));
+                    events.ScheduleEvent(EVENT_COLLAPSE, 6s);
                 }
             }
 
@@ -255,22 +255,22 @@ class boss_magtheridon : public CreatureScript
                             DoZoneInCombat();
                             events.SetPhase(PHASE_2);
                             instance->SetData(DATA_MANTICRON_CUBE, ACTION_ENABLE);
-                            events.ScheduleEvent(EVENT_CLEAVE, Seconds(10));
-                            events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(60));
-                            events.ScheduleEvent(EVENT_BLAZE, Seconds(20));
-                            events.ScheduleEvent(EVENT_QUAKE, Seconds(35));
-                            events.ScheduleEvent(EVENT_BERSERK, Minutes(20));
+                            events.ScheduleEvent(EVENT_CLEAVE, 10s);
+                            events.ScheduleEvent(EVENT_BLAST_NOVA, 1min);
+                            events.ScheduleEvent(EVENT_BLAZE, 20s);
+                            events.ScheduleEvent(EVENT_QUAKE, 35s);
+                            events.ScheduleEvent(EVENT_BERSERK, 20min);
                             break;
                         case EVENT_COLLAPSE:
                             instance->SetData(DATA_COLLAPSE_2, ACTION_ENABLE);
-                            events.ScheduleEvent(EVENT_DEBRIS_KNOCKDOWN, Seconds(4));
+                            events.ScheduleEvent(EVENT_DEBRIS_KNOCKDOWN, 4s);
                             break;
                         case EVENT_DEBRIS_KNOCKDOWN:
                             if (Creature* trigger = instance->GetCreature(DATA_WORLD_TRIGGER))
                             {
                                 trigger->CastSpell(trigger, SPELL_DEBRIS_KNOCKDOWN, true);
                                 me->SetReactState(REACT_AGGRESSIVE);
-                                events.ScheduleEvent(EVENT_DEBRIS, Seconds(20));
+                                events.ScheduleEvent(EVENT_DEBRIS, 20s);
                             }
                             break;
                         case EVENT_DEBRIS:
@@ -337,10 +337,10 @@ class npc_hellfire_channeler : public CreatureScript
                 if (Creature* magtheridon = _instance->GetCreature(DATA_MAGTHERIDON))
                     magtheridon->AI()->DoAction(ACTION_START_CHANNELERS_EVENT);
 
-                _events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(20));
-                _events.ScheduleEvent(EVENT_CHECK_FRIEND, Seconds(1));
-                _events.ScheduleEvent(EVENT_ABYSSAL, Seconds(30));
-                _events.ScheduleEvent(EVENT_FEAR, Seconds(15), Seconds(20));
+                _events.ScheduleEvent(EVENT_SHADOWBOLT, 20s);
+                _events.ScheduleEvent(EVENT_CHECK_FRIEND, 1s);
+                _events.ScheduleEvent(EVENT_ABYSSAL, 30s);
+                _events.ScheduleEvent(EVENT_FEAR, 15s, 20s);
 
             }
 
@@ -398,7 +398,7 @@ class npc_hellfire_channeler : public CreatureScript
                                 {
                                     DoCast(target, SPELL_DARK_MENDING);
                                     _canCastDarkMending = false;
-                                    _events.ScheduleEvent(EVENT_DARK_MENDING, Seconds(10), Seconds(20));
+                                    _events.ScheduleEvent(EVENT_DARK_MENDING, 10s, 20s);
                                 }
                             }
                             _events.Repeat(Seconds(1));
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 6852ebbdd45..a81e5d8493f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -330,7 +330,7 @@ class npc_fel_orc_convert : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_HEMORRHAGE, 3000);
+                events.ScheduleEvent(EVENT_HEMORRHAGE, 3s);
 
                 if (Creature* Kurse = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_NETHEKURSE)))
                     if (me->IsWithinDist(Kurse, 45.0f))
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 3868e260c04..a26dfb9c85b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -423,7 +423,7 @@ class npc_omrogg_heads : public CreatureScript
             {
                 if (data == SETDATA_DATA && value == SETDATA_YELL)
                 {
-                    events.ScheduleEvent(EVENT_DEATH_YELL, 4000);
+                    events.ScheduleEvent(EVENT_DEATH_YELL, 4s);
                 }
             }
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 2ed16192e5d..1464d3ebcbf 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -366,7 +366,7 @@ struct advisorbase_ai : public ScriptedAI
             _hasRessurrected = true;
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
             me->SetStandState(UNIT_STAND_STATE_STAND);
-            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2000);
+            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s);
         }
     }
 
@@ -494,7 +494,7 @@ class boss_kaelthas : public CreatureScript
 
                         _phase = PHASE_INTRO;
                         instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS);
-                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23000);
+                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23s);
                         break;
                     case ACTION_PREPARE_ADVISORS:
                         for (uint8 i = 0; i < MAX_ADVISORS; ++i)
@@ -516,7 +516,7 @@ class boss_kaelthas : public CreatureScript
                         {
                             case ADVISOR_THALADRED:
                                 Talk(SAY_INTRO_THALADRED);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_SANGUINAR:
                                 Talk(SAY_INTRO_SANGUINAR);
@@ -524,20 +524,20 @@ class boss_kaelthas : public CreatureScript
                                 break;
                             case ADVISOR_CAPERNIAN:
                                 Talk(SAY_INTRO_CAPERNIAN);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_TELONICUS:
                                 Talk(SAY_INTRO_TELONICUS);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400ms);
                                 break;
                             case MAX_DEFEATED_ADVISORS:
                                 // Every advisor defeated - Phase 2 starts.
                                 Talk(SAY_PHASE2_WEAPON);
-                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500);
+                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500ms);
                                 break;
                             case MAX_KILLED_ADVISORS:
                                 // Every advisor killed - Phase 3 starts.
-                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5000);
+                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5s);
                                 break;
                             default:
                                 break;
@@ -608,14 +608,14 @@ class boss_kaelthas : public CreatureScript
                         me->SetDisableGravity(true);
                         //me->SetHover(true); -- Set in sniffs, but breaks his visual.
                         events.ScheduleEvent(EVENT_TRANSITION_2, 2000);
-                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                         break;
                     case POINT_TRANSITION_HALFWAY_ASCENDING:
                         DoCast(me, SPELL_NETHER_BEAM_VISUAL3, true);
                         events.ScheduleEvent(EVENT_TRANSITION_3, 1000);
                         break;
                     case POINT_TRANSITION_TOP:
-                        events.ScheduleEvent(EVENT_EXPLODE, 10000);
+                        events.ScheduleEvent(EVENT_EXPLODE, 10s);
                         break;
                     case POINT_TRANSITION_HALFWAY_DESCENDING:
                         events.ScheduleEvent(EVENT_TRANSITION_5, 2000);
@@ -761,7 +761,7 @@ class boss_kaelthas : public CreatureScript
                             if (_pyrosCast < 3)
                             {
                                 DoCastVictim(SPELL_PYROBLAST);
-                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3000);
+                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3s);
                                 _pyrosCast++;
                             }
                             else
@@ -783,7 +783,7 @@ class boss_kaelthas : public CreatureScript
                                     DoCast(unit, SPELL_NETHER_BEAM);
 
                                 _netherbeamsCast++;
-                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3000);
+                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3s);
                             }
                             else
                                 _netherbeamsCast = 0;
@@ -823,22 +823,22 @@ class boss_kaelthas : public CreatureScript
                             if (GameObject* window = instance->GetGameObject(DATA_TEMPEST_BRIDGE_WINDOW))
                                 window->UseDoorOrButton();
 
-                            events.ScheduleEvent(EVENT_END_TRANSITION, 10000);
+                            events.ScheduleEvent(EVENT_END_TRANSITION, 10s);
                             break;
                         case EVENT_SIZE_INCREASE:
                             switch (_scaleStage)
                             {
                                 case 0:
                                     me->SetObjectScale(1.4f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                                     break;
                                 case 1:
                                     me->SetObjectScale(1.8f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3s);
                                     break;
                                 case 2:
                                     me->SetObjectScale(2.0f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1s);
                                     break;
                                 case 3:
                                     me->SetObjectScale(2.2f);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 410480f5f50..ebabe28e45b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -85,9 +85,9 @@ class boss_void_reaver : public CreatureScript
                 _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_POUNDING, 15000);
-                events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
+                events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
             }
 
             void UpdateAI(uint32 diff) override
@@ -128,7 +128,7 @@ class boss_void_reaver : public CreatureScript
                             if (target)
                                 me->CastSpell(target, SPELL_ARCANE_ORB);
 
-                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
+                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
                             break;
                         }
                         case EVENT_KNOCK_AWAY:
@@ -137,7 +137,7 @@ class boss_void_reaver : public CreatureScript
                             if (GetThreat(me->GetVictim()))
                                 ModifyThreatByPercent(me->GetVictim(), -25);
 
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
                             break;
                         case EVENT_BERSERK:
                             if (!Enraged)
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 3ec963d4131..50f44a7816a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -68,8 +68,8 @@ class boss_gatewatcher_gyrokill : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
-                events.ScheduleEvent(EVENT_SAW_BLADE, 20000);
+                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10s);
+                events.ScheduleEvent(EVENT_SAW_BLADE, 20s);
                 events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
                 Talk(SAY_AGGRO);
             }
@@ -95,16 +95,16 @@ class boss_gatewatcher_gyrokill : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(13000, 17000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 13s, 17s);
                             break;
                         case EVENT_SAW_BLADE:
                             DoCast(me, SPELL_SAW_BLADE);
                             Talk(SAY_SAW_BLADEs);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 20s, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 25s, 35s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 584706c13ba..fc5a0243cf4 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -99,7 +99,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(35000, 50000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 35s, 50s);
                             break;
                         case EVENT_JACKHAMMER:
                             Talk(EMOTE_HAMMER);
@@ -107,11 +107,11 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                             DoCastVictim(SPELL_JACKHAMMER, true);
                             if (roll_chance_i(50))
                                 Talk(SAY_HAMMER);
-                            events.ScheduleEvent(EVENT_JACKHAMMER, 30000);
+                            events.ScheduleEvent(EVENT_JACKHAMMER, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SHADOW_POWER, urand(20000, 28000));
+                            events.ScheduleEvent(EVENT_SHADOW_POWER, 20s, 28s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index c8f1a3666aa..81e61522f29 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -80,13 +80,13 @@ class boss_mechano_lord_capacitus : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(YELL_AGGRO);
-                events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_BERSERK, 3 * MINUTE * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_HEADCRACK, 10s);
+                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15s);
+                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
+                events.ScheduleEvent(EVENT_BERSERK, 3min);
 
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS);
+                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -116,27 +116,27 @@ class boss_mechano_lord_capacitus : public CreatureScript
                     {
                         case EVENT_HEADCRACK:
                             DoCastVictim(SPELL_HEADCRACK);
-                            events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_HEADCRACK, 10s);
                             break;
                         case EVENT_REFLECTIVE_DAMAGE_SHIELD:
                             Talk(YELL_REFLECTIVE_DAMAGE_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_DAMAGE_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30s);
                             break;
                         case EVENT_REFLECTIVE_MAGIE_SHIELD:
                             Talk(YELL_REFLECTIVE_MAGIC_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_MAGIC_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30s);
                             break;
                         case EVENT_POSITIVE_SHIFT:
                             DoCastAOE(SPELL_POLARITY_SHIFT);
-                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, urand(45, 60) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 45s, 60s);
                             break;
                         case EVENT_SUMMON_NETHER_CHARGE:
                         {
                             Position pos = me->GetRandomNearPosition(5.0f);
                             me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
-                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
                             break;
                         }
                         case EVENT_BERSERK:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index e364704c588..a797348fe32 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -72,11 +72,11 @@ class boss_nethermancer_sepethrea : public CreatureScript
             void JustEngagedWith(Unit* who) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
-                events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000));
-                events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000));
-                events.ScheduleEvent(EVENT_KNOCKBACK, urand(22000, 28000));
-                events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
+                events.ScheduleEvent(EVENT_ARCANE_BLAST, 12s, 18s);
+                events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18s, 22s);
+                events.ScheduleEvent(EVENT_KNOCKBACK, 22s, 28s);
+                events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                 Talk(SAY_AGGRO);
                 DoCast(who, SPELL_SUMMON_RAGIN_FLAMES);
                 Talk(SAY_SUMMON);
@@ -109,7 +109,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
                     {
                         case EVENT_FROST_ATTACK:
                             DoCastVictim(SPELL_FROST_ATTACK, true);
-                            events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
+                            events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
                             break;
                         case EVENT_ARCANE_BLAST:
                             DoCastVictim(SPELL_ARCANE_BLAST, true);
@@ -117,17 +117,17 @@ class boss_nethermancer_sepethrea : public CreatureScript
                             break;
                         case EVENT_DRAGONS_BREATH:
                             DoCastVictim(SPELL_DRAGONS_BREATH, true);
-                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(12000, 22000));
+                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, 12s, 22s);
                             if (roll_chance_i(50))
                                 Talk(SAY_DRAGONS_BREATH);
                             break;
                         case EVENT_KNOCKBACK:
                             DoCastVictim(SPELL_KNOCKBACK, true);
-                            events.ScheduleEvent(EVENT_KNOCKBACK, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_KNOCKBACK, 15s, 25s);
                             break;
                         case EVENT_SOLARBURN:
                             DoCastVictim(SPELL_SOLARBURN, true);
-                            events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                            events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index d7767be345f..11b0548b7ce 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -79,11 +79,11 @@ class boss_pathaleon_the_calculator : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SUMMON, 30000);
-                events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000));
-                events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000));
-                events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 40000));
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(8000, 13000));
+                events.ScheduleEvent(EVENT_SUMMON, 30s);
+                events.ScheduleEvent(EVENT_MANA_TAP, 12s, 20s);
+                events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16s, 25s);
+                events.ScheduleEvent(EVENT_DOMINATION, 25s, 40s);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 13s);
                 Talk(SAY_AGGRO);
             }
 
@@ -131,24 +131,24 @@ class boss_pathaleon_the_calculator : public CreatureScript
                                 }
                             }
                             Talk(SAY_SUMMON);
-                            events.ScheduleEvent(EVENT_SUMMON, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_SUMMON, 30s, 45s);
                             break;
                         case EVENT_MANA_TAP:
                             DoCastVictim(SPELL_MANA_TAP, true);
-                            events.ScheduleEvent(EVENT_MANA_TAP, urand(14000, 22000));
+                            events.ScheduleEvent(EVENT_MANA_TAP, 14s, 22s);
                             break;
                         case EVENT_ARCANE_TORRENT:
                             DoCastVictim(SPELL_ARCANE_TORRENT, true);
-                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(12000, 18000));
+                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, 12s, 18s);
                             break;
                         case EVENT_DOMINATION:
                             Talk(SAY_DOMINATION);
                             DoCastVictim(SPELL_DOMINATION, true);
-                            events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_DOMINATION, 25s, 30s);
                             break;
                         case EVENT_ARCANE_EXPLOSION: // Heroic only
                             DoCastVictim(H_SPELL_ARCANE_EXPLOSION, true);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(10000, 14000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 10s, 14s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index dce22c470b2..9d820af9c68 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -87,11 +87,11 @@ class boss_dalliah_the_doomsayer : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000));
+                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 1s, 4s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 7s, 9s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                    events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
             }
 
@@ -105,7 +105,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6s);
                         soccothratesDeath = true;
                         break;
                     default:
@@ -148,13 +148,13 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                     {
                         case EVENT_GIFT_OF_THE_DOOMSAYER:
                             DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER, true);
-                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(16000, 21000));
+                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 16s, 21s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
                             Talk(SAY_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(19000, 21000));
-                            events.ScheduleEvent(EVENT_HEAL, 6000);
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 19s, 21s);
+                            events.ScheduleEvent(EVENT_HEAL, 6s);
                             break;
                         case EVENT_HEAL:
                             DoCast(me, SPELL_HEAL);
@@ -162,7 +162,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                             break;
                         case EVENT_SHADOW_WAVE:
                             DoCastVictim(SPELL_SHADOW_WAVE, true);
-                            events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
+                            events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 812ca3e1132..49dd986d5a8 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -114,9 +114,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
                 preFight = false;
             }
@@ -143,7 +143,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6s);
                         dalliahDeath = true;
                         break;
                     default:
@@ -246,12 +246,12 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                     {
                         case EVENT_FELFIRE_SHOCK:
                             DoCastVictim(SPELL_FELFIRE_SHOCK, true);
-                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
+                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
                             break;
                         case EVENT_KNOCK_AWAY:
                             DoCast(me, SPELL_KNOCK_AWAY);
                             Talk(SAY_KNOCK_AWAY);
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* dalliah = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_DALLIAH)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index b51224570b8..042e8ccf577 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -66,7 +66,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000));
                 events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000));
-                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                 Talk(SAY_AGGRO);
             }
 
@@ -102,7 +102,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                         case EVENT_SEED_OF_CORRUPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
                                 DoCast(target, SPELL_SEED_OF_CORRUPTION);
-                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 5bea3017ffa..b22be14450b 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -72,9 +72,9 @@ class boss_thorngrin_the_tender : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_SACRIFICE, 5700);
+                events.ScheduleEvent(EVENT_SACRIFICE, 5700ms);
                 events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000);
-                events.ScheduleEvent(EVENT_ENRAGE, 12000);
+                events.ScheduleEvent(EVENT_ENRAGE, 12s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -132,7 +132,7 @@ class boss_thorngrin_the_tender : public CreatureScript
                         case EVENT_ENRAGE:
                             Talk(EMOTE_ENRAGE);
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, 33000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 33s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index d0ac2fce4ba..86ceb87b1aa 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -73,14 +73,14 @@ class boss_doomlord_kazzak : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(6000, 10000));
-                _events.ScheduleEvent(EVENT_CLEAVE, 7000);
-                _events.ScheduleEvent(EVENT_THUNDERCLAP, urand(14000, 18000));
-                _events.ScheduleEvent(EVENT_VOID_BOLT, 30000);
+                _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 6s, 10s);
+                _events.ScheduleEvent(EVENT_CLEAVE, 7s);
+                _events.ScheduleEvent(EVENT_THUNDERCLAP, 14s, 18s);
+                _events.ScheduleEvent(EVENT_VOID_BOLT, 30s);
                 _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 25000);
-                _events.ScheduleEvent(EVENT_ENRAGE, 60000);
-                _events.ScheduleEvent(EVENT_TWISTED_REFLECTION, 33000);
-                _events.ScheduleEvent(EVENT_BERSERK, 180000);
+                _events.ScheduleEvent(EVENT_ENRAGE, 1min);
+                _events.ScheduleEvent(EVENT_TWISTED_REFLECTION, 33s);
+                _events.ScheduleEvent(EVENT_BERSERK, 3min);
             }
 
             void JustAppeared() override
@@ -126,29 +126,29 @@ class boss_doomlord_kazzak : public CreatureScript
                     {
                         case EVENT_SHADOW_VOLLEY:
                             DoCastVictim(SPELL_SHADOW_VOLLEY);
-                            _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(4000, 6000));
+                            _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 4s, 6s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, urand(8000, 12000));
+                            _events.ScheduleEvent(EVENT_CLEAVE, 8s, 12s);
                             break;
                         case EVENT_THUNDERCLAP:
                             DoCastVictim(SPELL_THUNDERCLAP);
-                            _events.ScheduleEvent(EVENT_THUNDERCLAP, urand(10000, 14000));
+                            _events.ScheduleEvent(EVENT_THUNDERCLAP, 10s, 14s);
                             break;
                         case EVENT_VOID_BOLT:
                             DoCastVictim(SPELL_VOID_BOLT);
-                            _events.ScheduleEvent(EVENT_VOID_BOLT, urand(15000, 18000));
+                            _events.ScheduleEvent(EVENT_VOID_BOLT, 15s, 18s);
                             break;
                         case EVENT_MARK_OF_KAZZAK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_MARK_OF_KAZZAK);
-                            _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20000);
+                            _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20s);
                             break;
                         case EVENT_ENRAGE:
                             Talk(EMOTE_FRENZY);
                             DoCast(me, SPELL_ENRAGE);
-                            _events.ScheduleEvent(EVENT_ENRAGE, 30000);
+                            _events.ScheduleEvent(EVENT_ENRAGE, 30s);
                             break;
                         case EVENT_TWISTED_REFLECTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index c9a025db8ef..5704c219e74 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -69,10 +69,10 @@ class boss_doomwalker : public CreatureScript
             {
                 _events.Reset();
                 _events.ScheduleEvent(EVENT_ENRAGE, 0);
-                _events.ScheduleEvent(EVENT_ARMOR, urand(5000, 13000));
-                _events.ScheduleEvent(EVENT_CHAIN, urand(10000, 30000));
-                _events.ScheduleEvent(EVENT_QUAKE, urand(25000, 35000));
-                _events.ScheduleEvent(EVENT_OVERRUN, urand(30000, 45000));
+                _events.ScheduleEvent(EVENT_ARMOR, 5s, 13s);
+                _events.ScheduleEvent(EVENT_CHAIN, 10s, 30s);
+                _events.ScheduleEvent(EVENT_QUAKE, 25s, 35s);
+                _events.ScheduleEvent(EVENT_OVERRUN, 30s, 45s);
                 Initialize();
             }
 
@@ -122,14 +122,14 @@ class boss_doomwalker : public CreatureScript
                             if (!HealthAbovePct(20))
                             {
                                 DoCast(me, SPELL_ENRAGE);
-                                _events.ScheduleEvent(EVENT_ENRAGE, 6000);
+                                _events.ScheduleEvent(EVENT_ENRAGE, 6s);
                                 _inEnrage = true;
                             }
                             break;
                         case EVENT_OVERRUN:
                             Talk(SAY_OVERRUN);
                             DoCastVictim(SPELL_OVERRUN);
-                            _events.ScheduleEvent(EVENT_OVERRUN, urand(25000, 40000));
+                            _events.ScheduleEvent(EVENT_OVERRUN, 25s, 40s);
                             break;
                         case EVENT_QUAKE:
                             if (urand(0, 1))
@@ -142,16 +142,16 @@ class boss_doomwalker : public CreatureScript
                                 me->RemoveAurasDueToSpell(SPELL_ENRAGE);
 
                             DoCast(me, SPELL_EARTHQUAKE);
-                            _events.ScheduleEvent(EVENT_QUAKE, urand(30000, 55000));
+                            _events.ScheduleEvent(EVENT_QUAKE, 30s, 55s);
                             break;
                         case EVENT_CHAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_CHAIN_LIGHTNING);
-                            _events.ScheduleEvent(EVENT_CHAIN, urand(7000, 27000));
+                            _events.ScheduleEvent(EVENT_CHAIN, 7s, 27s);
                             break;
                         case EVENT_ARMOR:
                             DoCastVictim(SPELL_SUNDER_ARMOR);
-                            _events.ScheduleEvent(EVENT_ARMOR, urand(10000, 25000));
+                            _events.ScheduleEvent(EVENT_ARMOR, 10s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index e1f83c14440..2d591f4d00b 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -461,18 +461,18 @@ class npc_simon_bunny : public CreatureScript
                         if (!CheckPlayer())
                             ResetNode();
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2000);
+                            _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2s);
                         break;
                     case EVENT_SIMON_SETUP_PRE_GAME:
                         SetUpPreGame();
                         _events.CancelEvent(EVENT_SIMON_GAME_TICK);
-                        _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1000);
+                        _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1s);
                         break;
                     case EVENT_SIMON_PLAY_SEQUENCE:
                         if (!playableSequence.empty())
                         {
                             PlayNextColor();
-                            _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1500);
+                            _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1500ms);
                         }
                         else
                         {
@@ -481,16 +481,16 @@ class npc_simon_bunny : public CreatureScript
                             playerSequence.clear();
                             PrepareClusters();
                             gameTicks = 0;
-                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3000);
+                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3s);
                         }
                         break;
                     case EVENT_SIMON_GAME_TICK:
                         DoCast(SPELL_AUDIBLE_GAME_TICK);
 
                         if (gameTicks > gameLevel)
-                            _events.ScheduleEvent(EVENT_SIMON_TOO_LONG_TIME, 500);
+                            _events.ScheduleEvent(EVENT_SIMON_TOO_LONG_TIME, 500ms);
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3000);
+                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3s);
                         gameTicks++;
                         break;
                     case EVENT_SIMON_RESET_CLUSTERS:
@@ -517,7 +517,7 @@ class npc_simon_bunny : public CreatureScript
                         if (gameLevel == 10)
                             ResetNode();
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_SETUP_PRE_GAME, 1000);
+                            _events.ScheduleEvent(EVENT_SIMON_SETUP_PRE_GAME, 1s);
                         break;
                     case ACTION_SIMON_CORRECT_FULL_SEQUENCE:
                         gameLevel++;
@@ -549,7 +549,7 @@ class npc_simon_bunny : public CreatureScript
 
                 PlayColor(pressedColor);
                 playerSequence.push_back(pressedColor);
-                _events.ScheduleEvent(EVENT_SIMON_RESET_CLUSTERS, 500);
+                _events.ScheduleEvent(EVENT_SIMON_RESET_CLUSTERS, 500ms);
                 CheckPlayerSequence();
             }
 
@@ -636,8 +636,8 @@ class npc_simon_bunny : public CreatureScript
                 }
 
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SIMON_ROUND_FINISHED, 1000);
-                _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2000);
+                _events.ScheduleEvent(EVENT_SIMON_ROUND_FINISHED, 1s);
+                _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2s);
 
                 if (GameObject* relic = me->FindNearestGameObject(large ? GO_APEXIS_MONUMENT : GO_APEXIS_RELIC, searchDistance))
                     relic->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index f483322b925..31f0dcf6d49 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -358,7 +358,7 @@ public:
         void Initialize()
         {
             helboarGUID.Clear();
-            _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, Seconds(3));
+            _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, 3s);
         }
 
         void Reset() override
@@ -376,7 +376,7 @@ public:
                 _events.CancelEvent(EVENT_SEARCH_HELBOAR);
                 me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
                 me->CastSpell(helboar, SPELL_FAKE_BLOOD);
-                _events.ScheduleEvent(EVENT_HELBOAR_FOUND, Seconds(2));
+                _events.ScheduleEvent(EVENT_HELBOAR_FOUND, 2s);
             }
         }
 
@@ -406,18 +406,18 @@ public:
                         {
                             me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
                             me->CastSpell(helboar, SPELL_FAKE_BLOOD);
-                            _events.ScheduleEvent(EVENT_SUMMON_POO, Seconds(1));
+                            _events.ScheduleEvent(EVENT_SUMMON_POO, 1s);
                         }
                         break;
                     case EVENT_SUMMON_POO:
                         DoCast(SPELL_SUMMON_POO);
-                        _events.ScheduleEvent(EVENT_FOLLOW_PLAYER, Seconds(2));
+                        _events.ScheduleEvent(EVENT_FOLLOW_PLAYER, 2s);
                         break;
                     case EVENT_FOLLOW_PLAYER:
                         me->SetWalk(false);
                         if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself())
                             me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f);
-                        _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, Seconds(3));
+                        _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, 3s);
                         break;
                 }
             }
@@ -557,7 +557,7 @@ public:
 
                 success = false;
 
-                events.ScheduleEvent(EVENT_SUMMON_SKULL, 10000);
+                events.ScheduleEvent(EVENT_SUMMON_SKULL, 10s);
                 break;
             case ACTION_JULES_FLIGHT:
                 me->RemoveAura(SPELL_JULES_GOES_PRONE);
@@ -626,7 +626,7 @@ public:
                     for (uint8 i = 0; i < summonCount; i++)
                         me->SummonCreature(NPC_DARKNESS_RELEASED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 1.5f, 0, TEMPSUMMON_MANUAL_DESPAWN);
 
-                    events.ScheduleEvent(EVENT_SUMMON_SKULL, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_SUMMON_SKULL, 10s, 15s);
                     break;
                 }
             }
@@ -728,7 +728,7 @@ public:
                 me->GetMotionMaster()->MovePoint(1, exorcismPos[1]);
 
             if (id == 1)
-                events.ScheduleEvent(EVENT_BARADAS_TALK, 2000);
+                events.ScheduleEvent(EVENT_BARADAS_TALK, 2s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -755,24 +755,24 @@ public:
                                 me->SetFacingTo(1.513286f);
 
                                 me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 3000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 3s);
                                 step++;
                                 break;
                             case 1:
                                 DoCast(SPELL_BARADAS_COMMAND);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 2:
                                 Talk(SAY_BARADA_3);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 7000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 7s);
                                 step++;
                                 break;
                             case 3:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_2);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 18000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 18s);
                                 step++;
                                 break;
                             case 4:
@@ -782,98 +782,98 @@ public:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->DoAction(ACTION_JULES_HOVER);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 11000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 11s);
                                 step++;
                                 break;
                             case 5:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13s);
                                 step++;
                                 break;
                             case 6:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 7:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13s);
                                 step++;
                                 break;
                             case 8:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12s);
                                 step++;
                                 break;
                             case 9:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12s);
                                 step++;
                                 break;
                             case 10:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 11:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->DoAction(ACTION_JULES_FLIGHT);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 12:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 8000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 8s);
                                 step++;
                                 break;
                             case 13:
                                 Talk(SAY_BARADA_5);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 14:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 15:
                                 Talk(SAY_BARADA_6);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 16:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_5);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 17:
                                 Talk(SAY_BARADA_7);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 18:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 19:
                                 Talk(SAY_BARADA_7);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 20:
@@ -883,7 +883,7 @@ public:
                                     jules->RemoveAura(SPELL_JULES_VOMITS_AURA);
                                 }
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 21:
@@ -900,7 +900,7 @@ public:
                                 Talk(SAY_BARADA_8);
                                 me->GetMotionMaster()->MoveTargetedHome();
                                 EnterEvadeMode();
-                                events.ScheduleEvent(EVENT_RESET, Minutes(2));
+                                events.ScheduleEvent(EVENT_RESET, 2min);
                                 break;
                         }
                         break;
@@ -953,7 +953,7 @@ public:
             me->SetFacingToObject(player);
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
             _playerGUID = player->GetGUID();
-            _events.ScheduleEvent(EVENT_TALK, Seconds(2));
+            _events.ScheduleEvent(EVENT_TALK, 2s);
         }
 
         void Reset() override
@@ -979,7 +979,7 @@ public:
                 me->SetImmuneToPC(true);
                 Talk(SAY_DEFEATED);
 
-                _events.ScheduleEvent(EVENT_EVADE, Minutes(1));
+                _events.ScheduleEvent(EVENT_EVADE, 1min);
             }
         }
 
@@ -993,22 +993,22 @@ public:
                 {
                 case EVENT_TALK:
                     Talk(SAY_CHALLENGE);
-                    _events.ScheduleEvent(EVENT_ATTACK, Seconds(2));
+                    _events.ScheduleEvent(EVENT_ATTACK, 2s);
                     break;
                 case EVENT_ATTACK:
                     me->SetImmuneToPC(false);
                     me->SetFaction(FACTION_MONSTER_2);
                     me->EngageWithTarget(ObjectAccessor::GetPlayer(*me, _playerGUID));
                     _events.ScheduleEvent(EVENT_FIREBALL, 1);
-                    _events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FROSTNOVA, 5s);
                     break;
                 case EVENT_FIREBALL:
                     DoCast(SPELL_FIREBALL);
-                    _events.ScheduleEvent(EVENT_FIREBALL, Seconds(10));
+                    _events.ScheduleEvent(EVENT_FIREBALL, 10s);
                     break;
                 case EVENT_FROSTNOVA:
                     DoCastAOE(SPELL_FROSTNOVA);
-                    _events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(20));
+                    _events.ScheduleEvent(EVENT_FROSTNOVA, 20s);
                     break;
                 case EVENT_EVADE:
                     EnterEvadeMode();
@@ -1154,7 +1154,7 @@ struct npc_infernal_rain_hellfire : public ScriptedAI
         {
             case DATA_ACTIVE:
                 _events.ScheduleEvent(EVENT_INFERNAL_RAIN_CAST, 1s, 2s);
-                _events.ScheduleEvent(EVENT_INFERNAL_RAIN_STOP, 60s);
+                _events.ScheduleEvent(EVENT_INFERNAL_RAIN_STOP, 1min);
                 break;
             default:
                 break;
@@ -1220,7 +1220,7 @@ struct npc_fear_controller : public ScriptedAI
         if (data == DATA_ACTIVE)
         {
             _events.ScheduleEvent(EVENT_FEAR_CAST, 1s);
-            _events.ScheduleEvent(EVENT_FEAR_STOP, 60s);
+            _events.ScheduleEvent(EVENT_FEAR_STOP, 1min);
         }
     }
 
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index bdcdd944447..ef4f3cacb7a 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -731,7 +731,7 @@ public:
         void DoAction(int32 /*action*/) override
         {
             Talk(SAY_FREE);
-            _events.ScheduleEvent(EVENT_TELEPORT, Seconds(5));
+            _events.ScheduleEvent(EVENT_TELEPORT, 5s);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 388c9c35942..3a549eef703 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -81,7 +81,7 @@ public:
             ground = me->GetPositionZ();
             me->UpdateGroundPositionZ(me->GetPositionX(), me->GetPositionY(), ground);
             SummonInfernal();
-            events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, urand(1000, 3000));
+            events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 1s, 3s);
         }
 
         void SetData(uint32 id, uint32 data) override
@@ -111,7 +111,7 @@ public:
                     if (Unit* infernal = ObjectAccessor::GetUnit(*me, infernalGUID))
                         if (infernal->GetDisplayId() == MODEL_INVISIBLE)
                             me->CastSpell(infernal, SPELL_SUMMON_INFERNAL, true);
-                    events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 12000);
+                    events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 12s);
                     break;
                 }
                 default:
@@ -1465,15 +1465,15 @@ public:
                 case NPC_ENRAGED_FIRE_SPIRIT:
                     if (!me->GetAura(SPELL_FEL_FIRE_AURA))
                         DoCastSelf(SPELL_FEL_FIRE_AURA);
-                    _events.ScheduleEvent(EVENT_ENRAGED_FIRE_SPIRIT, Seconds(2), Seconds(10));
+                    _events.ScheduleEvent(EVENT_ENRAGED_FIRE_SPIRIT, 2s, 10s);
                     break;
                 case NPC_ENRAGED_EARTH_SPIRIT:
                     if (!me->GetAura(SPELL_FEL_FIRE_AURA))
                         DoCastSelf(SPELL_FEL_FIRE_AURA);
-                    _events.ScheduleEvent(EVENT_ENRAGED_EARTH_SPIRIT, Seconds(3), Seconds(4));
+                    _events.ScheduleEvent(EVENT_ENRAGED_EARTH_SPIRIT, 3s, 4s);
                     break;
                 case NPC_ENRAGED_AIR_SPIRIT:
-                    _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, Seconds(10));
+                    _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, 10s);
                     break;
                 default:
                     break;
@@ -1508,12 +1508,12 @@ public:
                     case EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING:
                         if (UpdateVictim())
                             DoCastVictim(SPELL_CHAIN_LIGHTNING);
-                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_HURRICANE, Seconds(3), Seconds(5));
+                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_HURRICANE, 3s, 5s);
                         break;
                     case EVENT_ENRAGED_AIR_SPIRIT_HURRICANE:
                         if (UpdateVictim())
                             DoCastVictim(SPELL_HURRICANE);
-                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, Seconds(15), Seconds(20));
+                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, 15s, 20s);
                         break;
                     default:
                         break;