Updated usages of prefixed functions