Fix internal API consistency