Rename, align with org.isuper