diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
index d0986292a..f9102a0f6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
@@ -26,7 +26,7 @@ private val postWorldTick = WeakHashMap<Level, TickList>()
 private val preServerTickTimers = TimerQueue()
 private val postServerTickTimers = TimerQueue()
 
-fun addPreTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
+fun onceServerPre(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
 	if (!SERVER_IS_LIVE) {
 		LOGGER.error("Refusing to add timer $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping"))
 		return null
@@ -35,7 +35,7 @@ fun addPreTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
 	return preServerTickTimers.Timer(inTicks, callback)
 }
 
-fun addPostTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
+fun onceServer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
 	if (!SERVER_IS_LIVE) {
 		LOGGER.error("Refusing to add ticker $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping"))
 		return null
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitCraftingUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitCraftingUpgradeItem.kt
index deea2d2cb..d6e8023ee 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitCraftingUpgradeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitCraftingUpgradeItem.kt
@@ -11,10 +11,8 @@ import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.addPostTickTimer
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.registry.MRegistry
 import ru.dbotthepony.mc.otm.runIfClient
 
 class ExoSuitCraftingUpgradeItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(1).rarity(Rarity.RARE)) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt
index a8d8c01f3..970aea2ad 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt
@@ -11,7 +11,7 @@ import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.addPostTickTimer
+import ru.dbotthepony.mc.otm.onceServer
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.registry.MRegistry
@@ -65,7 +65,7 @@ class ExoSuitProbeItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CRE
 			player.hurt(MRegistry.DAMAGE_EXOSUIT_PROBE, 1f)
 
 			for (i in 2 .. 8) {
-				addPostTickTimer((i - 1) * 100) {
+				onceServer((i - 1) * 100) {
 					if (!player.hasDisconnected()) {
 						if (i == 6) {
 							player.displayClientMessage(TranslatableComponent("otm.exosuit.granted$i", player.displayName.copy().withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.DARK_AQUA), false)