Use same naming scheme as JSS