[Patch] Reverted naming to original